Skip to content

Commit dcf6a5a

Browse files
lucas-koontzea-rus
andauthored
Updates mindsdb-sql-parser version (#216)
* Updates mindsdb-sql-parser version Updates the mindsdb-sql-parser dependency to the latest version to leverage new features and bug fixes. Addresses compatibility issues and improves SQL parsing capabilities. STRC-539 * Updates package version to 3.4.10 Increment the package version number to reflect the latest release. STRC-539 * removed 3.8 added 3.12, 3.13 * unpin pip * removed 3.9 * fixing tests * update release file * bump version * Downgrade version from 3.4.11 to 3.4.10 --------- Co-authored-by: andrew <elkin.andr@gmail.com>
1 parent 6a7d0fe commit dcf6a5a

File tree

6 files changed

+19
-18
lines changed

6 files changed

+19
-18
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ubuntu-latest]
13-
python-version: ['3.8', '3.9', '3.10', '3.11']
13+
python-version: ['3.10', '3.11', '3.12', '3.13']
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: Set up Python ${{ matrix.python-version }}
@@ -19,7 +19,7 @@ jobs:
1919
python-version: ${{ matrix.python-version }}
2020
- name: Install dependencies
2121
run: |
22-
python -m pip install --upgrade pip==22.0.4
22+
python -m pip install --upgrade pip
2323
pip install -r requirements.txt
2424
pip install -r requirements_test.txt
2525
pip install --no-cache-dir .
@@ -41,10 +41,10 @@ jobs:
4141
- name: Set up Python
4242
uses: actions/setup-python@v2
4343
with:
44-
python-version: '3.9'
44+
python-version: '3.10'
4545
- name: Install dependencies
4646
run: |
47-
python -m pip install --upgrade pip==20.2.4
47+
python -m pip install --upgrade pip
4848
pip install setuptools wheel twine
4949
- name: Build and publish
5050
env:

.github/workflows/test_prs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-latest]
14-
python-version: ['3.8', '3.9', '3.10', '3.11']
14+
python-version: ['3.10', '3.11', '3.12', '3.13']
1515
steps:
1616
- uses: actions/checkout@v2
1717
- name: Set up Python ${{ matrix.python-version }}
@@ -20,7 +20,7 @@ jobs:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies
2222
run: |
23-
python -m pip install --upgrade pip==22.0.4
23+
python -m pip install --upgrade pip
2424
pip install -r requirements.txt
2525
pip install -r requirements_test.txt
2626
pip install --no-cache-dir .
@@ -41,10 +41,10 @@ jobs:
4141
pull-requests: write
4242
steps:
4343
- uses: actions/checkout@v3
44-
- name: Set up Python 3.8
44+
- name: Set up Python 3.10
4545
uses: actions/setup-python@v2
4646
with:
47-
python-version: 3.8
47+
python-version: "3.10"
4848

4949
- name: Install dependencies
5050
run: |

mindsdb_sdk/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__title__ = 'mindsdb_sdk'
22
__package_name__ = 'mindsdb_sdk'
3-
__version__ = '3.4.9'
3+
__version__ = '3.4.10'
44
__description__ = "MindsDB Python SDK, provides an SDK to use a remote mindsdb instance"
55
__email__ = "jorge@mindsdb.com"
66
__author__ = 'MindsDB Inc'

mindsdb_sdk/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ def describe(self, type: str = None) -> Union[pd.DataFrame, Query]:
341341
identifier = self._get_identifier()
342342
if type is not None:
343343
identifier.parts.append(type)
344+
identifier.is_quoted.append(False)
344345
ast_query = Describe(identifier)
345346

346347
sql = ast_query.to_string()

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
requests
22
pandas >= 1.3.5
3-
mindsdb-sql-parser == 0.10.0
3+
mindsdb-sql-parser == 0.13.7
44
docstring-parser >= 0.7.3
55
tenacity >= 8.0.1
66
openai >= 1.74.1

tests/test_sdk.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ def check_model(self, model, database, mock_post):
107107
assert call_args[1]['json']['params'] == params
108108

109109
# check prediction
110-
assert (pred_df == pd.DataFrame(data_out)).all().bool()
110+
assert pred_df.equals(pd.DataFrame(data_out))
111111

112112
# predict using dict
113-
pred_df = model.predict({ 'a': 1 })
114-
assert (pred_df == pd.DataFrame(data_out)).all().bool()
113+
pred_df = model.predict({'a': 1})
114+
assert pred_df.equals(pd.DataFrame(data_out))
115115

116116
# using deferred query
117117
response_mock(mock_post, pd.DataFrame(data_out)) # will be used sql/query
@@ -121,15 +121,15 @@ def check_model(self, model, database, mock_post):
121121

122122
check_sql_call(mock_post,
123123
f'SELECT m.* FROM (SELECT * FROM {query.database} (select a from t1)) AS t JOIN {model.project.name}.{model_name} AS m USING x="1"')
124-
assert (pred_df == pd.DataFrame(data_out)).all().bool()
124+
assert pred_df.equals(pd.DataFrame(data_out))
125125

126126
# using table
127127
table0 = database.tables.tbl0
128128
pred_df = model.predict(table0)
129129

130130
check_sql_call(mock_post,
131131
f'SELECT m.* FROM (SELECT * FROM {table0.db.name}.tbl0) AS t JOIN {model.project.name}.{model_name} AS m')
132-
assert (pred_df == pd.DataFrame(data_out)).all().bool()
132+
assert pred_df.equals(pd.DataFrame(data_out))
133133

134134

135135
# time series prediction
@@ -138,7 +138,7 @@ def check_model(self, model, database, mock_post):
138138

139139
check_sql_call(mock_post,
140140
f'SELECT m.* FROM (SELECT * FROM {query.database} (select * from t1 where type="house" and saledate>latest)) as t JOIN {model.project.name}.{model_name} AS m')
141-
assert (pred_df == pd.DataFrame(data_out)).all().bool()
141+
assert pred_df.equals(pd.DataFrame(data_out))
142142

143143
# ----------- model managing --------------
144144
response_mock(
@@ -524,7 +524,7 @@ def check_database(self, database, mock_post):
524524

525525
check_sql_call(mock_post, sql)
526526

527-
assert (data == result).all().bool()
527+
assert data.equals(result)
528528

529529
# test tables
530530
response_mock(mock_post, pd.DataFrame([{'name': 't1'}]))
@@ -990,7 +990,7 @@ def check_database(self, database, mock_post):
990990

991991
check_sql_call(mock_post, sql)
992992

993-
assert (data == result).all().bool()
993+
assert data.equals(result)
994994

995995
# test tables
996996
response_mock(mock_post, pd.DataFrame([{'name': 't1'}]))

0 commit comments

Comments
 (0)