dataroom-client 1.0.1.post49.dev0__tar.gz → 1.0.1.post62.dev0__tar.gz

{dataroom_client-1.0.1.post49.dev0 → dataroom_client-1.0.1.post62.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dataroom-client
-Version: 1.0.1.post49.dev0
+Version: 1.0.1.post62.dev0
 Summary: A python client to interface with the Dataroom backend API
 Author: Ales Kocjancic
 Author-email: hi@ales.io

{dataroom_client-1.0.1.post49.dev0 → dataroom_client-1.0.1.post62.dev0}/dataroom_client/client.py

@@ -1,4 +1,8 @@
 import asyncio
+import functools
+import inspect
+import threading
+import atexit
 from datetime import datetime
 import json as json_module
 import logging
@@ -1440,12 +1444,75 @@ class DataRoomClient:
         )
 
 
+
+class AsyncRunner:
+    """
+    Manages a single, shared event loop in a background thread
+    to run async functions from a synchronous context using classmethods.
+
+    The shutdown method is automatically registered to be called on exit.
+    """
+    _loop: asyncio.AbstractEventLoop | None = None
+    _thread: threading.Thread | None = None
+    _lock = threading.Lock() # To ensure thread-safe initialization
+
+    @classmethod
+    def _initialize(cls):
+        """Initializes the background event loop and thread if not already done."""
+        with cls._lock:
+            if cls._thread is not None:
+                return
+
+            cls._loop = asyncio.new_event_loop()
+            cls._thread = threading.Thread(
+                target=cls._loop.run_forever,
+                daemon=True,
+                name="ClassAsyncRunnerThread"
+            )
+            cls._thread.start()
+            # Register the shutdown method to be called when the program exits.
+            # This is done here to ensure it's only registered once.
+            atexit.register(cls.shutdown)
+            logger.debug("Initialized ClassAsyncRunner background thread")
+
+    @classmethod
+    def run(cls, coro):
+        """
+        Runs a coroutine on the shared background event loop and returns the result.
+        Initializes the loop on the first call.
+        """
+        if cls._thread is None:
+            cls._initialize()
+
+        future = asyncio.run_coroutine_threadsafe(coro, cls._loop)
+        return future.result()
+
+    @classmethod
+    def shutdown(cls):
+        """
+        Cleanly stops the shared event loop.
+        This is registered with atexit and called automatically.
+        """
+        # The check for cls._loop is important because atexit might call this
+        # even if the runner was never initialized.
+        if cls._loop and cls._loop.is_running():
+            logger.debug("Shutting down ClassAsyncRunner background thread...")
+            cls._loop.call_soon_threadsafe(cls._loop.stop)
+            # It's good practice to have a timeout on join
+            cls._thread.join(timeout=5) 
+            cls._loop.close()
+            logger.debug("ClassAsyncRunner has been shut down.")
+        
+        cls._loop = None
+        cls._thread = None
+
+
 class DataRoomClientSync:
     """
     The official client of the DataRoom API using synchronous method and requests.
     """
 
-    def __init__(self, api_key=None, api_url=None):
+    def __init__(self, api_key=None, api_url=None, timeout=120):
         """
         @param api_key: API key for DataRoom API
         @param api_url: URL of the DataRoom backend API
@@ -1457,140 +1524,32 @@ class DataRoomClientSync:
         )
         if not self.api_url:
             raise DataRoomError("DataRoom api_url is not set")
-        self._async_client = DataRoomClient(api_key=api_key, api_url=api_url)
+        self._async_client = DataRoomClient(api_key=self.api_key, api_url=self.api_url, timeout=timeout)
 
-    # -------------------- Private methods --------------------
+    def __getattr__(self, name):
+        """
+        Dynamically create sync methods for all methods of the async client.
+        """
+        attr = getattr(self._async_client, name)
 
-    @classmethod
-    def _run_sync(cls, coro):
-        try:
-            # Check if there's an existing running event loop
-            loop = asyncio.get_running_loop()
-        except RuntimeError:
-            # No running event loop, create a new one
-            return asyncio.run(coro)
-        else:
-            # A running event loop exists, use run_until_complete
-            return loop.run_until_complete(coro)
+        if not callable(attr):
+            return attr
 
-    def _make_request(self, *args, **kwargs):
-        return self._run_sync(self._async_client._make_request(*args, **kwargs))
+        @functools.wraps(attr)
+        def sync_wrapper(*args, **kwargs):
+            result = attr(*args, **kwargs)
+            if inspect.isawaitable(result):
+                return AsyncRunner.run(result)
+            return result
 
-    def _make_paginated_request(self, *args, **kwargs):
-        return self._run_sync(
-            self._async_client._make_paginated_request(*args, **kwargs)
-        )
+        return sync_wrapper
 
-    # -------------------- Utils --------------------
+    def __dir__(self) -> List[str]:
+        """
+        Provide a list of attributes for introspection and autocompletion in tools like IPython.
+        """
+        return sorted(list(set(super().__dir__()) | set(dir(self._async_client))))
 
     @classmethod
     def download_image_from_url(cls, *args, **kwargs) -> DataRoomFile:
-        return cls._run_sync(DataRoomClient.download_image_from_url(*args, **kwargs))
-
-    # -------------------- Image API methods --------------------
-
-    def get_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_images(*args, **kwargs))
-
-    def get_images_iter(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_images_iter(*args, **kwargs))
-    
-    def get_random_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_random_images(*args, **kwargs))
-
-    def count_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.count_images(*args, **kwargs))
-
-    def get_image(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_image(*args, **kwargs))
-
-    def create_image(self, *args, **kwargs):
-        return self._run_sync(self._async_client.create_image(*args, **kwargs))
-
-    def create_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.create_images(*args, **kwargs))
-
-    def delete_image(self, *args, **kwargs):
-        return self._run_sync(self._async_client.delete_image(*args, **kwargs))
-
-    def get_image_audit_logs(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_image_audit_logs(*args, **kwargs))
-
-    def get_image_similarity(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_image_similarity(*args, **kwargs))
-
-    def get_related_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_related_images(*args, **kwargs))
-
-    def get_similar_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_similar_images(*args, **kwargs))
-
-    def set_image_latent(self, *args, **kwargs):
-        return self._run_sync(self._async_client.set_image_latent(*args, **kwargs))
-
-    def delete_image_latent(self, *args, **kwargs):
-        return self._run_sync(self._async_client.delete_image_latent(*args, **kwargs))
-
-    def update_image(self,*args, **kwargs):
-        return self._run_sync(self._async_client.update_image(*args, **kwargs))
-
-    def update_images(self,*args, **kwargs):
-        return self._run_sync(self._async_client.update_images(*args, **kwargs))
-
-    def add_image_attributes(self, *args, **kwargs):
-        return self._run_sync(self._async_client.add_image_attributes(*args, **kwargs))
-
-    def add_image_attributes_in_bulk(self, *args, **kwargs):
-        return self._run_sync(self._async_client.add_image_attributes_in_bulk(*args, **kwargs))
-
-    def set_image_coca_embedding(self, *args, **kwargs):
-        return self._run_sync(self._async_client.set_image_coca_embedding(*args, **kwargs))
-    
-    def aggregate_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.aggregate_images(*args, **kwargs))
-
-    def bucket_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.bucket_images(*args, **kwargs))
-
-    # -------------------- Tag API methods --------------------
-
-    def create_tag(self, *args, **kwargs):
-        return self._run_sync(self._async_client.create_tag(*args, **kwargs))
-
-    def get_tag(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_tag(*args, **kwargs))
-
-    def get_tags(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_tags(*args, **kwargs))
-
-    def tag_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.tag_images(*args, **kwargs))
-
-    # -------------------- Dataset API methods --------------------
-
-    def get_datasets(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_datasets(*args, **kwargs))
-
-    def get_dataset(self, *args, **kwargs):
-        return self._run_sync(self._async_client.get_dataset(*args, **kwargs))
-
-    def create_dataset(self, *args, **kwargs):
-        return self._run_sync(self._async_client.create_dataset(*args, **kwargs))
-    
-    def freeze_dataset(self, *args, **kwargs):
-        return self._run_sync(self._async_client.freeze_dataset(*args, **kwargs))
-    
-    def unfreeze_dataset(self, *args, **kwargs):
-        return self._run_sync(self._async_client.unfreeze_dataset(*args, **kwargs))
-
-    def dataset_add_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.dataset_add_images(*args, **kwargs))
-
-    def dataset_remove_images(self, *args, **kwargs):
-        return self._run_sync(self._async_client.dataset_remove_images(*args, **kwargs))
-
-
-for method_name in dir(DataRoomClient):
-    if not method_name.startswith("_"):
-        if not hasattr(DataRoomClientSync, method_name):
-            logger.warning(f"Missing implementation: DataRoomClientSync.{method_name}")
+        return AsyncRunner.run(DataRoomClient.download_image_from_url(*args, **kwargs))

{dataroom_client-1.0.1.post49.dev0 → dataroom_client-1.0.1.post62.dev0}/pyproject.toml

@@ -6,7 +6,7 @@ authors = [
 ]
 readme = "README.md"
 dynamic = []
-version = "1.0.1.post49.dev0"
+version = "1.0.1.post62.dev0"
 
 [tool.poetry]