refactor: optimize json unmarshall

.github/workflows/py_lint.yml

@@ -5,7 +5,7 @@ on:
       - main
 jobs:
   py_lint:
-    name: line lint
+    name: py lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

opengemini_client/client_impl.py

@@ -10,7 +10,7 @@
 from requests import HTTPError
 
 from opengemini_client.client import Client
-from opengemini_client.models import Config, BatchPoints, Query, QueryResult
+from opengemini_client.models import Config, BatchPoints, Query, QueryResult, Series, SeriesResult
 from opengemini_client.url_const import UrlConst
 from opengemini_client.utils import AtomicInt
 
@@ -125,7 +125,16 @@ def query(self, query: Query) -> QueryResult:
 
         resp = self.request(method='GET', server_url=server_url, url_path=UrlConst.QUERY, params=params)
         if resp.status_code == HTTPStatus.OK:
-            return QueryResult(resp.json())
+            json_data = resp.json()
+            results = []
+
+            for result in json_data.get('results', []):
+                series_list = [Series(name=series['name']) for series in result.get('series', [])]
+                series_result = SeriesResult(series=series_list)
+                results.append(series_result)
+
+            return QueryResult(results=results)
+
         raise HTTPError(f"Query error: {resp.status_code}, Response: {resp.text}")
 
     def write_batch_points(self, database: str, batch_points: BatchPoints):

opengemini_client/models.py

@@ -75,20 +75,20 @@ class Series:
     values: List[List[Any]] = field(default_factory=list)
 
 
-@dataclass
-class SeriesResult:
-    series: List[Series] = field(default_factory=list)
-    error: str = ""
-
-
 @dataclass
 class Query:
     database: str
     command: str
     retention_policy: str
 
 
+@dataclass
+class SeriesResult:
+    series: List[Series] = field(default_factory=list)
+    error: str = None
+
+
 @dataclass
 class QueryResult:
     results: List[SeriesResult] = field(default_factory=list)
-    error: str = ""
+    error: str = None

opengemini_client/query_test.py

@@ -16,5 +16,10 @@ def test_query_databases_success(self):
                             )
         with client_impl.OpenGeminiDBClient(cfg) as cli:
             qr = cli.query(query=models.Query('', 'show databases', ''))
-            result = qr.results['results'][0]
-            self.assertEqual(result['statement_id'], 0)
+            self.assertEqual(qr.error, None)
+            results = qr.results
+            self.assertEqual(len(results), 1)
+            result = results[0]
+            self.assertEqual(result.error, None)
+            series = result.series
+            self.assertEqual(len(series), 1)