dve-lumipy-testing 1.0.489__py3-none-any.whl → 1.0.491__py3-none-any.whl

{dve_lumipy_testing-1.0.489.dist-info → dve_lumipy_testing-1.0.491.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dve-lumipy-testing
-Version: 1.0.489
+Version: 1.0.491
 Summary: Python library for Luminesce
 Author: FINBOURNE Technology
 Author-email: engineering@finbourne.com

{dve_lumipy_testing-1.0.489.dist-info → dve_lumipy_testing-1.0.491.dist-info}/RECORD

@@ -1,6 +1,6 @@
 lumipy/__init__.py,sha256=Ei0SkyOIPS-aC-ZSdaHwfiH7xWMBelLY-EXJ0--jzUo,443
 lumipy/_config_manager.py,sha256=0ziIk7EyZb44uDw84Pw9UBrY9PmcMYe92WbgF58xylM,8675
-lumipy/client.py,sha256=UmVdbdwVLz25yVBmqZNG8k9ii86h7g8xKQoA1g-IT0s,22611
+lumipy/client.py,sha256=r1Yk8vIUb34qQWFaGWb-omtVndg3lTiL7Wi3lbqbDls,23201
 lumipy/common.py,sha256=wMCeQ8SdCdPiAqyHmVCTy8Wpxs8uJU7sSbYkgu3k5Ls,1701
 lumipy/query_job.py,sha256=f13vvK1n4czNNg0Jxq8ACrVHdZ20bRQi2rAV_HlfKBA,5395
 lumipy/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,7 +12,7 @@ lumipy/cli/commands/run.py,sha256=q_mQwPdeRliRG4rCuDcK6GG8M-cwwZpHGGPAaGQRFvg,49
 lumipy/cli/commands/setup.py,sha256=cdB0SFubk4qV2g2xLI5trNz1JVIfkXmTbFuk6t2TtGw,1761
 lumipy/cli/commands/test.py,sha256=K0sMcf-IhQHi1aZ6izzdqBCYVvtiqjdicLkMbgP5gJM,4462
 lumipy/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lumipy/helpers/backoff_handler.py,sha256=ET8q6uOK4EWoLHiQSf4B662BUcjCHfVl6-GySTsKTvU,773
+lumipy/helpers/backoff_handler.py,sha256=dXz1ISZpT4XZWe8b_mdeCmSUgYeF-uAqsXu3cVBqP20,772
 lumipy/lumiflex/__init__.py,sha256=3IwIV_MfU2thRLDBl-BmDV0j-oG2LfNAY07WBh0Wlb8,50
 lumipy/lumiflex/column.py,sha256=qONYKsaanXQlhAHLNVjBvl3tUDjx5SJANNarc7zJ1YI,30585
 lumipy/lumiflex/table.py,sha256=wTDVgaYN_5cvtzcoThyPDcOGAm4kb3r5qiqzrrNADVs,6793
@@ -57,7 +57,7 @@ lumipy/lumiflex/_table/__init__.py,sha256=FdLm71ndJXKlXjp8zxRrgnmVtIC1RoGrHO1J6B
 lumipy/lumiflex/_table/base_table.py,sha256=TdNmDCrx2nhmJKE4iFI_vWGgq6YEOVaFZ8ZkIVGunvE,8969
 lumipy/lumiflex/_table/content.py,sha256=yrMUNvD0pQkh-0XyusfHjSvVyctjPMn2miSiDKwebfc,7519
 lumipy/lumiflex/_table/join.py,sha256=KrzBjB0CtHLKSYX4D1QN6BOaR8Ct9ADQz7ia9g3LF78,7407
-lumipy/lumiflex/_table/operation.py,sha256=ZsqkdOK15S6wtUoqYNhEC8VrrQZ0GVqqTf_jC19mGhE,33422
+lumipy/lumiflex/_table/operation.py,sha256=V9BttjaYY-8CTklgc1CqFhLYMy8xKam7GOfgDgBLnnw,33873
 lumipy/lumiflex/_table/parameter.py,sha256=7P6RbI8OCMxXZhpgAOSd0oHJW8X1wlfxKPHXBBpimcs,1757
 lumipy/lumiflex/_table/variable.py,sha256=iqoUqY-AQpHua69VsHciNELppmsDtYbAgb2-9ZEz-cI,9637
 lumipy/lumiflex/_table/widgets.py,sha256=wCjNE5WXo8DaH7qVlY7WRNQf4dLWweme6uhV5_6_Eh8,2926
@@ -78,7 +78,7 @@ lumipy/provider/common.py,sha256=95210WHs_s2PmFqQBFeIFHm3KeJVbTsy8kOLysvkvD4,696
 lumipy/provider/context.py,sha256=VwsHZO46HP3G9BN4Eot_jQlbfETGKyNg2vG5wm1zL_4,5401
 lumipy/provider/factory.py,sha256=QFuSCT_byJwbFmHF669I2iz0vLAF0T9Or1ghIEUZ0ok,9257
 lumipy/provider/manager.py,sha256=A4bxCO__m5nc9GL8veOLtySbK1giMNDMml_r3B-q8y8,7218
-lumipy/provider/max_version.py,sha256=epGae8z1ELH-pPV9B92NLz_cui_BHugM2b3DOQNx_eY,28
+lumipy/provider/max_version.py,sha256=BJIu7KWzYUUI2dJRkFnRJaqG82Py1dV7BW2pVkV9aSs,28
 lumipy/provider/metadata.py,sha256=WGfMv_tLn5W29-zMKipqBpueroe0eF-w9Hj_6QRdZAI,5483
 lumipy/provider/provider_sets.py,sha256=Z_VyiN2dBP1xuIdRiuGgyzLD7LfO4wxFvodprME2Uls,1478
 lumipy/provider/implementation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -378,9 +378,9 @@ lumipy/test/unit/provider_tests/test_provider_api.py,sha256=ZovhykIlIRzEG5jj7-ic
 lumipy/test/unit/provider_tests/test_provider_factory.py,sha256=ICHlEiYS-GvKFoI5JCTsH17InQfUeYL0uNOHZO6V8a0,6395
 lumipy/test/unit/provider_tests/test_provider_manager.py,sha256=-TT-3ZGpDsFKMz4efWIy7TGAUVtZ2gTDa67DiorIioc,13456
 lumipy/test/unit/queryjob_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lumipy/test/unit/queryjob_tests/test_queryjob.py,sha256=1UE4-VuIkAE6vo0vogq3p2iXtTukiAPxOt5Uankx7c4,1542
-dve_lumipy_testing-1.0.489.dist-info/METADATA,sha256=q8nUg1KsPym_jaEZpPB2QVkQVzXcoJCjYZB-H1oLefI,14827
-dve_lumipy_testing-1.0.489.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dve_lumipy_testing-1.0.489.dist-info/entry_points.txt,sha256=L7hRlqwmvzHMwaOQzygKLK-gx4k4e1q4Qz5m0DGihW8,46
-dve_lumipy_testing-1.0.489.dist-info/top_level.txt,sha256=DVww8LaQM3Xm0WOgo4JE0epePgCM1xGWWWxh7wuv-CY,7
-dve_lumipy_testing-1.0.489.dist-info/RECORD,,
+lumipy/test/unit/queryjob_tests/test_queryjob.py,sha256=CVcMaezQ578Qh_5sukr6BqKMHJxs9Pawiik0J1rVObo,1539
+dve_lumipy_testing-1.0.491.dist-info/METADATA,sha256=oe1hCbGw816lAJSXEVRKY0MiT0vJg3Fml2psIr1PkXo,14827
+dve_lumipy_testing-1.0.491.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dve_lumipy_testing-1.0.491.dist-info/entry_points.txt,sha256=L7hRlqwmvzHMwaOQzygKLK-gx4k4e1q4Qz5m0DGihW8,46
+dve_lumipy_testing-1.0.491.dist-info/top_level.txt,sha256=DVww8LaQM3Xm0WOgo4JE0epePgCM1xGWWWxh7wuv-CY,7
+dve_lumipy_testing-1.0.491.dist-info/RECORD,,

lumipy/client.py

@@ -1,3 +1,4 @@
+import ast
 import asyncio
 import io
 import json
@@ -126,7 +127,9 @@ class Client:
         Returns:
             DataFrame: dataframe containing table field catalog information.
         """
-        return pd.DataFrame(json.loads(self._catalog_api.get_catalog()))
+        res = self._catalog_api.get_catalog()
+        d = ast.literal_eval(res)
+        return pd.DataFrame(d)
 
     def query_and_fetch(
             self,
@@ -170,7 +173,14 @@ class Client:
         """
         return self._design_api.put_query_to_format(body=_add_lumipy_tag(sql), **pretty_params)
 
-    def start_query(self, sql: str, name: Optional[str] = "query", timeout: Optional[int] = 3600, keep_for: Optional[int] = 7200) -> str:
+    def start_query(
+        self,
+        sql: str,
+        name: Optional[str] = "query",
+        timeout: Optional[int] = 3600,
+        keep_for: Optional[int] = 7200,
+        correlation_id: Optional[str] = None,
+    ) -> str:
         """Send an asynchronous query to Luminesce. Starts the query but does not wait and fetch the result.
 
         Args:
@@ -178,19 +188,26 @@ class Client:
             name (str): name of the query (defaults to just 'query')
             timeout (int): max time for the query to run in seconds (defaults to 3600)
             keep_for (int): time to keep the query result for in seconds (defaults to 7200)
+            correlation_id (str): optional correlation id for the query (defaults to None)
 
         Returns:
             str: string containing the execution ID
 
         """
-        res = self._sql_bkg_exec_api.start_query(
+        if correlation_id:
+            headers_kw = {"_headers": {"CorrelationId": correlation_id, "X-LUSID-Application": "luminesce/lumipy"}}
+        else:
+            headers_kw = {}
+
+        res = self._sql_bkg_exec_api.start_query_with_http_info(
             body=_add_lumipy_tag(sql),
             query_name=name,
             timeout_seconds=timeout,
-            keep_for_seconds=keep_for
+            keep_for_seconds=keep_for,
+            **headers_kw,
         )
 
-        return res.execution_id
+        return res.data.execution_id
 
     def get_status(self, execution_id: str) -> Dict[str, str]:
         """Get the status of a Luminesce query
@@ -280,14 +297,15 @@ class Client:
             """)
 
     def run(
-            self,
-            sql: str,
-            timeout: Optional[int] = 3600,
-            keep_for: Optional[int] = 7200,
-            quiet: Optional[bool] = False,
-            return_job: Optional[bool] = False,
-            _print_fn: Optional[Callable] = None,
-            **read_csv_params
+        self,
+        sql: str,
+        timeout: Optional[int] = 3600,
+        keep_for: Optional[int] = 7200,
+        quiet: Optional[bool] = False,
+        return_job: Optional[bool] = False,
+        correlation_id: Optional[str] = None,
+        _print_fn: Optional[Callable] = None,
+        **read_csv_params,
     ) -> DataFrame:
         """Run a sql string in Luminesce. This method can either run synchonously which will print query progress to the
          screen and then return the result or return a QueryJob instance that allows you to manage the query job yourself.
@@ -299,6 +317,7 @@ class Client:
             quiet (Optional[bool]): whether to print query progress or not
             return_job (Optional[bool]): whether to return a QueryJob instance or to wait until completion and return
             the result as a pandas dataframe
+            correlation_id: a correlation id for the query (defaults to None)
             _print_fn (Optional[Callable]): alternative print function for showing progress. This is mainly for internal use with
             the streamlit utility functions that show query progress in a cell. Defaults to the normal python print() fn.
             **read_csv_params (Any): keyword arguments to pass down to pandas read_csv. See https://pandas.pydata.org/docs/reference/api/pandas.read_csv.html
@@ -308,7 +327,7 @@ class Client:
             represents the running query.
 
         """
-        ex_id = self.start_query(sql, timeout=timeout, keep_for=keep_for)
+        ex_id = self.start_query(sql, timeout=timeout, keep_for=keep_for, correlation_id=correlation_id)
         job = QueryJob(ex_id, client=self, _print_fn=_print_fn)
         if return_job:
             return job

lumipy/helpers/backoff_handler.py

@@ -4,7 +4,7 @@ import time
 
 
 class BackoffHandler:
-    def __init__(self, pause_time: Optional[float] = 0.1, max_pause_time: Optional[float] = 10, beta: Optional[float] = math.exp(1/200)):
+    def __init__(self, pause_time: Optional[float] = 0.1, max_pause_time: Optional[float] = 10, beta: Optional[float] = math.exp(1/20)):
         if pause_time < 0.1 or pause_time > max_pause_time:
             raise ValueError(f"Pause time must be between 0.1 and {max_pause_time}, both inclusive.")
         if beta < 1:

lumipy/lumiflex/_table/operation.py

@@ -35,13 +35,20 @@ class TableOperation(Node, ABC):
     def content(self):
         return self.get_parents()[-1]
 
-    def go(self, timeout: Optional[int] = 3600, keep_for: Optional[int] = 7200, quiet: Optional[bool] = False) -> DataFrame:
+    def go(
+        self,
+        timeout: Optional[int] = 3600,
+        keep_for: Optional[int] = 7200,
+        quiet: Optional[bool] = False,
+        correlation_id: Optional[str] = None,
+    ) -> DataFrame:
         """Send query off to Luminesce, monitor progress and then get the result back as a pandas dataframe.
 
         Args:
             timeout (Optional[int]): max time for the query to run in seconds (defaults to 3600)
             keep_for (Optional[int]): time to keep the query result for in seconds (defaults to 7200)
             quiet (Optional[bool]): whether to print query progress or not
+            correlation_id (Optional[str]): correlation id for the query (defaults to None)
 
         Returns:
             DataFrame: the result of the query as a pandas dataframe.
@@ -50,15 +57,23 @@ class TableOperation(Node, ABC):
             f"-- built with fluent syntax\n{self.get_sql()}",
             timeout=timeout,
             keep_for=keep_for,
-            quiet=quiet
+            quiet=quiet,
+            correlation_id=correlation_id,
         )
 
-    def go_async(self, timeout: Optional[int] = 3600, keep_for: Optional[int] = 7200, _print_fn: Optional[Callable] = None):
+    def go_async(
+        self,
+        timeout: Optional[int] = 3600,
+        keep_for: Optional[int] = 7200,
+        correlation_id: Optional[str] = None,
+        _print_fn: Optional[Callable] = None,
+    ):
         """Just send the query to luminesce. Don't monitor progress or fetch result, just return a job object.
 
         Args:
             timeout (Optional[int]): max time for the query to run in seconds (defaults to 3600)
             keep_for (Optional[int]): time to keep the query result for in seconds (defaults to 7200)
+            correlation_id (Optional[int]): optional correlation id for the query (defaults to None)
             _print_fn (Optional[callable]): alternative print function for showing progress. This is mainly for internal use with
             the streamlit utility functions that show query progress in a cell. Defaults to the normal python print() fn.
 
@@ -70,7 +85,8 @@ class TableOperation(Node, ABC):
             timeout=timeout,
             keep_for=keep_for,
             return_job=True,
-            _print_fn=_print_fn
+            correlation_id=correlation_id,
+            _print_fn=_print_fn,
         )
 
     def get_sql(self) -> str:

lumipy/provider/max_version.py

@@ -1 +1 @@
-max_version_str = '1.18.673'
+max_version_str = '1.18.697'

lumipy/test/unit/queryjob_tests/test_queryjob.py

@@ -23,11 +23,11 @@ class TestQueryJob(unittest.TestCase):
     def test_default_optional_values(self):
         backoff_handler_test = BackoffHandler()
         backoff_handler_test.sleep()
-        self.assertAlmostEqual(backoff_handler_test.pause_time, 0.1005012520859401, places = 5)
+        self.assertAlmostEqual(backoff_handler_test.pause_time, 0.105127109637602, places = 5)
 
     def test_call_1000_times_pause_time_equals_max_pause_time(self):
         backoff_handler_test = BackoffHandler()
-        # I have checked that this is constant after 922 requests
-        for i in range(1000):
+        # I have checked that this is constant after 94 requests
+        for i in range(100):
             backoff_handler_test._update_pause_time()
         self.assertEqual(backoff_handler_test.pause_time, 10)