ga-api-client 0.5.0__tar.gz → 0.5.2__tar.gz

{ga_api_client-0.5.0/ga_api_client.egg-info → ga_api_client-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ga-api-client
-Version: 0.5.0
+Version: 0.5.2
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{ga_api_client-0.5.0 → ga_api_client-0.5.2}/ga_api/ga_api_client.py

@@ -205,7 +205,7 @@ class Client:
         async with self._sem:
             # test_fn is a function to check if the request should be sent
             if test_fn is not None and test_fn() is False:
-                return None
+                return 0, None
             ts_req = datetime.datetime.now().strftime('%Y/%m/%d %H:%M:%S')
             while True:
                 try:
@@ -421,7 +421,6 @@ class Reader:
         logging.info(f'/record status={status} start={_logtime(start)} end={_logtime(end)} series={self.series}')
         if rlt is not None and len(rlt) > 0:
             self.count += len(rlt) - 1 # skip first row, which is header
-            # print(rlt)
             return pd.DataFrame(rlt[1:], columns=rlt[0])
         return pd.DataFrame() # empty dataframe is returned if no data
 
@@ -452,7 +451,10 @@ class Reader:
                 df = pd.concat([df, rlt], ignore_index=True, copy=False)
                 if len(df) >= self.size:
                     break
-            return df.head(self.size)[fields]
+            if self.fields is None:
+                return df.head(self.size)
+            else:
+                return df.head(self.size)[self.fields]
         except Exception as e:
             logging.error(f'execute record fail {e}')
             for task in tasks:
@@ -854,10 +856,8 @@ class Pipeline:
         except:
             ts = None
         if ts is None:
-            print('range')
             return await self._read_range(dts, *args, **kwargs)
         else:
-            print('point')
             return await self._read_point(ts, *args, **kwargs)
 
 class Dataset:

{ga_api_client-0.5.0 → ga_api_client-0.5.2/ga_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ga-api-client
-Version: 0.5.0
+Version: 0.5.2
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{ga_api_client-0.5.0 → ga_api_client-0.5.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ga-api-client
-version = 0.5.0
+version = 0.5.2
 long_description = file: README.md
 long_description_content_type = text/markdown
 classifiers =