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

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

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

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

@@ -409,16 +409,18 @@ class Reader:
     async def _exec(self, start, end):
         start = _get_utc_timestamp(start)
         end = _get_utc_timestamp(end)
-        if 'config' not in self.pipeline:
-            self.pipeline['config'] = {}
-        self.pipeline['config']['start'] = start
-        self.pipeline['config']['end'] = end
-        self.pipeline['config']['size'] = self.size
-        self.pipeline['config']['series'] = self.series
+        pipeline = self.pipeline.copy()
+        if 'config' not in pipeline:
+            pipeline['config'] = {}
+        pipeline['config']['start'] = start
+        pipeline['config']['end'] = end
+        pipeline['config']['size'] = self.size
+        pipeline['config']['series'] = self.series
         if self.fields is not None:
-            self.pipeline['config']['fields'] = self.fields
-        status, rlt = await self._client._request('POST', f'/record', [200], self.pipeline, self.test_fn)
-        logging.info(f'/record status={status} start={_logtime(start)} end={_logtime(end)} series={self.series}')
+            pipeline['config']['fields'] = self.fields
+        status, rlt = await self._client._request('POST', f'/record', [200], pipeline, self.test_fn)
+        if status != 0:
+            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
             return pd.DataFrame(rlt[1:], columns=rlt[0])
@@ -451,10 +453,9 @@ class Reader:
                 df = pd.concat([df, rlt], ignore_index=True, copy=False)
                 if len(df) >= self.size:
                     break
-            if self.fields is None:
-                return df.head(self.size)
-            else:
+            if self.fields is not None and len(df) != 0:
                 return df.head(self.size)[self.fields]
+            return df.head(self.size)
         except Exception as e:
             logging.error(f'execute record fail {e}')
             for task in tasks:
@@ -657,7 +658,7 @@ def _compute_kcol_mcol(pipeline):
     moper = []
     if 'bucket' in pipeline:
         for bkt in pipeline['bucket']:
-            if bkt[0] in ['$distinctTuple','enumTuple']:
+            if bkt[0] in ['$distinctTuple','$enumTuple', '$distinctTree']:
                 # each field introduce one key column
                 kcol += len(bkt[1]['fields'])
             else:
@@ -704,9 +705,10 @@ class _translate_table:
                         output_row.append(tuple(elem))
                     else:
                         output_row.append(elem)
-                else:
-                    moper_idx = self.moper[int((idx-self.kcol)/2)]
-                    output_row.append(MOPER_MAP[moper_idx](elem))
+                else: # metric
+                    moper_idx = int((idx-self.kcol)/2)
+                    moper = self.moper[moper_idx]
+                    output_row.append(MOPER_MAP[moper](elem))
             yield output_row
 
 class _translate_rlts:

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

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

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

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