dqlmagic 1.3.1__tar.gz → 1.3.2__tar.gz

{dqlmagic-1.3.1 → dqlmagic-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dqlmagic
-Version: 1.3.1
+Version: 1.3.2
 Summary: IPython magic function for Dynatrace Query Language (DQL)
 Home-page: https://github.com/dtPaTh/Dqlmagic
 Author: Patrick Thurner

{dqlmagic-1.3.1 → dqlmagic-1.3.2}/dqlmagic/__init__.py

@@ -1,4 +1,4 @@
-__version__='1.3.1'
+__version__='1.3.2'
 
 from .dqlmagic import DQLmagic
 

{dqlmagic-1.3.1 → dqlmagic-1.3.2}/dqlmagic/dqlmagic.py

@@ -113,14 +113,16 @@ class DQLmagic(Magics):
             jdata = json.loads(res)
             records = jdata["result"]["records"]
         
-        if self.shell.user_ns and cell is not None: 
+        if getattr(self, "shell", None) is not None and getattr(self.shell, "user_ns", None) is not None and cell is not None:
             if line and not line.isspace():
                 self.shell.user_ns.update({line: records})
             else:
                 self.shell.user_ns.update({"_dql_result": records})
             
-            if records:
-                return str(len(records))+" records returned"
+            if isinstance(records, (list, tuple, set, dict)):  
+                return str(len(records)) + " records returned"
+            else:
+                return "0 records returned"
         else:
             return records
 

{dqlmagic-1.3.1 → dqlmagic-1.3.2}/dqlmagic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dqlmagic
-Version: 1.3.1
+Version: 1.3.2
 Summary: IPython magic function for Dynatrace Query Language (DQL)
 Home-page: https://github.com/dtPaTh/Dqlmagic
 Author: Patrick Thurner

{dqlmagic-1.3.1 → dqlmagic-1.3.2}/pyproject.toml

@@ -1,3 +1,3 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"

{dqlmagic-1.3.1 → dqlmagic-1.3.2}/readme.md

@@ -1,89 +1,89 @@
-# Dqlmagic
-
-An IPython magic function allowing to use DQL in your notebooks.
-
-Dynatrace Query Language (DQL) is a powerful tool to explore your data and discover patterns, identify anomalies and outliers, create statistical modeling, and more based on data stored in Dynatrace Grail storage. 
-
-Dqlmagic makes DQL queries available to be used in jupyter notebooks.
-
-## Available magic functions
-
-### %%dql or %dql
-Executes a DQL query and returns the queried records as json array.
-
-### Example 1
-Query in code-cell..
-```
-%%dql
-fetch logs 
-| limit 10
-```
-.. and use result in another code cell:
-```
-import pandas as pd
-
-#put result into a dataframe
-df = pd.DataFrame(_dql_result)
-df.head()
-```
-**Note:** 
-By default ``%%dql`` writes into ``_dql_result``. You can optionally customize the target objects name to configure an alternative name like this: 
-```
-%%dql my_result
-fetch logs | limit 10
-```
-
-### Example 2 - Inline Query
-```
-import pandas as pd
-
-res = %dql fetch logs | limit 10
-df = pd.DataFrame(res)
-df.head()
-```
-
-### %dql_raw and %%dql_raw
-Same as ```%dql``` or ```%%dql```, but returns instead of the result records the full API response json
-
-### %auth_grail <config_prefix>
-Inline function connecting to the grail cluster. 
-
-Reads connection parameters from .env file: 
-```
-dt_oauth_url="https://sso.dynatrace.com/sso/oauth2/token"
-
-dt_oauth_clientid="<YOUR-CLIENT-ID>"
-dt_oauth_clientsecret="<YOUR-CLIENT-SECRET>"
-dt_oauth_scope="<YOUR-ACCESS-SCOPE>"
-
-dt_tenant="<YOUR-TENANT-ID>"
-grail_apiurl="https://<YOUR-TENANT-ID>.live.dynatrace.com/api/v2/dql/query"
-```
-
-The ```<config_prefix>``` is **optional** to be used if you have multiple configs stored in your .env file like e.g. 
-
-```
-dt_config_prefix="DEV"
-
-DEV_dt_oauth_url="https://sso.dynatrace.com/sso/oauth2/token"
-DEV_dt_oauth_clientid="<YOUR-DEV-CLIENT-ID>"
-DEV_dt_oauth_clientsecret="<YOUR-DEV-CLIENT-SECRET>"
-DEV_dt_oauth_scope="<YOUR-DEV-ACCESS-SCOPE>"
-DEV_dt_tenant="<YOUR-DEV-TENANT-ID>"
-DEV_grail_apiurl="https://<YOUR-DEV-TENANT-ID>.apps.dynatracelabs.com/platform/storage/query/v1/"
-
-PROD_dt_oauth_url="https://sso.dynatrace.com/sso/oauth2/token"
-PROD_dt_oauth_clientid="<YOUR-PROD-CLIENT-ID>"
-PROD_dt_oauth_clientsecret="<YOUR-PROD-CLIENT-SECRET>"
-PROD_dt_oauth_scope="<YOUR-PROD-ACCESS-SCOPE>"
-PROD_dt_tenant="<YOUR-PROD-TENANT-ID>"
-PROD_grail_apiurl="https://<YOUR-PROD-TENANT-ID>.apps.dynatracelabs.com/platform/storage/query/v1/"
-
-```
-
-With the parameter ```dt_config_prefix```, you set the default config prefix used, if %auth_grail parameter ```<config_prefix>``` is not provided.
-
-For more details on how to setup API oauth clients in Dynatrace see [Configure and manage account API OAuth clients
-](https://www.dynatrace.com/support/help/how-to-use-dynatrace/account-management/identity-access-management/account-api-oauth)
-
+# Dqlmagic
+
+An IPython magic function allowing to use DQL in your notebooks.
+
+Dynatrace Query Language (DQL) is a powerful tool to explore your data and discover patterns, identify anomalies and outliers, create statistical modeling, and more based on data stored in Dynatrace Grail storage. 
+
+Dqlmagic makes DQL queries available to be used in jupyter notebooks.
+
+## Available magic functions
+
+### %%dql or %dql
+Executes a DQL query and returns the queried records as json array.
+
+### Example 1
+Query in code-cell..
+```
+%%dql
+fetch logs 
+| limit 10
+```
+.. and use result in another code cell:
+```
+import pandas as pd
+
+#put result into a dataframe
+df = pd.DataFrame(_dql_result)
+df.head()
+```
+**Note:** 
+By default ``%%dql`` writes into ``_dql_result``. You can optionally customize the target objects name to configure an alternative name like this: 
+```
+%%dql my_result
+fetch logs | limit 10
+```
+
+### Example 2 - Inline Query
+```
+import pandas as pd
+
+res = %dql fetch logs | limit 10
+df = pd.DataFrame(res)
+df.head()
+```
+
+### %dql_raw and %%dql_raw
+Same as ```%dql``` or ```%%dql```, but returns instead of the result records the full API response json
+
+### %auth_grail <config_prefix>
+Inline function connecting to the grail cluster. 
+
+Reads connection parameters from .env file: 
+```
+dt_oauth_url="https://sso.dynatrace.com/sso/oauth2/token"
+
+dt_oauth_clientid="<YOUR-CLIENT-ID>"
+dt_oauth_clientsecret="<YOUR-CLIENT-SECRET>"
+dt_oauth_scope="<YOUR-ACCESS-SCOPE>"
+
+dt_tenant="<YOUR-TENANT-ID>"
+grail_apiurl="https://<YOUR-TENANT-ID>.live.dynatrace.com/api/v2/dql/query"
+```
+
+The ```<config_prefix>``` is **optional** to be used if you have multiple configs stored in your .env file like e.g. 
+
+```
+dt_config_prefix="DEV"
+
+DEV_dt_oauth_url="https://sso.dynatrace.com/sso/oauth2/token"
+DEV_dt_oauth_clientid="<YOUR-DEV-CLIENT-ID>"
+DEV_dt_oauth_clientsecret="<YOUR-DEV-CLIENT-SECRET>"
+DEV_dt_oauth_scope="<YOUR-DEV-ACCESS-SCOPE>"
+DEV_dt_tenant="<YOUR-DEV-TENANT-ID>"
+DEV_grail_apiurl="https://<YOUR-DEV-TENANT-ID>.apps.dynatracelabs.com/platform/storage/query/v1/"
+
+PROD_dt_oauth_url="https://sso.dynatrace.com/sso/oauth2/token"
+PROD_dt_oauth_clientid="<YOUR-PROD-CLIENT-ID>"
+PROD_dt_oauth_clientsecret="<YOUR-PROD-CLIENT-SECRET>"
+PROD_dt_oauth_scope="<YOUR-PROD-ACCESS-SCOPE>"
+PROD_dt_tenant="<YOUR-PROD-TENANT-ID>"
+PROD_grail_apiurl="https://<YOUR-PROD-TENANT-ID>.apps.dynatracelabs.com/platform/storage/query/v1/"
+
+```
+
+With the parameter ```dt_config_prefix```, you set the default config prefix used, if %auth_grail parameter ```<config_prefix>``` is not provided.
+
+For more details on how to setup API oauth clients in Dynatrace see [Configure and manage account API OAuth clients
+](https://www.dynatrace.com/support/help/how-to-use-dynatrace/account-management/identity-access-management/account-api-oauth)
+
 For more details on .env file see [How to NOT embedded credential in Jupyter notebook](https://yuthakarn.medium.com/how-to-not-show-credential-in-jupyter-notebook-c349f9278466) or [python-dotenv](https://pypi.org/project/python-dotenv/)