kardioutils 1.0.22__tar.gz → 1.0.24__tar.gz

{kardioutils-1.0.22/kardioutils.egg-info → kardioutils-1.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kardioutils
-Version: 1.0.22
+Version: 1.0.24
 Summary: Utils lib
 Author: João Neto
 Author-email: joao.filipe.neto@gmail.com

kardioutils-1.0.24/dl2050utils/__version__.py

@@ -0,0 +1 @@
+version = "1.0.24"

{kardioutils-1.0.22 → kardioutils-1.0.24}/dl2050utils/fdb.py

@@ -3,6 +3,8 @@ import pathlib
 from pathlib import Path
 import numpy as np
 from dl2050utils.common import pickle_save, pickle_load
+from dl2050utils.fs import np_load_async, pickle_load_async
+import asyncio
 
 class FileDB():
     """
@@ -84,6 +86,39 @@ class FileDB():
             if show:
                 print(f'FileDB save Exception: {exc}')
             return 1
+    async def async_save(
+        self,
+        key,
+        data,
+        pre='',
+        ext='',
+        save_f=pickle_save,
+        allow_pickle=False,
+        show=False
+    ):
+        """
+        Async save: não bloqueia o event loop (corre o save numa thread).
+        Returns 0 se OK, 1 se erro.
+        """
+        dir_path = Path(self.get_dir(key))
+        dir_path.mkdir(parents=True, exist_ok=True)
+        file_name = self.get_name(key, pre=pre, ext=ext)
+        p = dir_path / file_name
+
+        def _save_sync():
+            if ext == '.npy':
+                np.save(p, data, allow_pickle=allow_pickle)
+            else:
+                save_f(p, data)
+            return 0
+
+        try:
+            return await asyncio.to_thread(_save_sync)
+        except Exception as exc:
+            if show:
+                print(f'FileDB async_save Exception: {exc}')
+            return 1
+    
 
     def load(self, key, pre='', ext='', load_f=pickle_load, allow_pickle=False,show=False):
         """
@@ -106,6 +141,27 @@ class FileDB():
             if show:
                 print(f'FileDB load Exception: {exc}')
             return None
+    async def async_load(self, key, pre='', ext='', load_f=pickle_load_async, allow_pickle=False,show=False):
+        """
+        Loads data from a file based on the key, prefix, and extension.
+        Args:
+            key (int or str): The unique identifier for the file.
+            pre (str, optional): A prefix for the file name.
+            ext (str, optional): The file extension. Use '.npy' for NumPy arrays.
+            load_f (callable, optional): The load function to use (defaults to pickle_load).
+        Returns:
+            any: The loaded data or None if the load failed.
+        """
+        dir_path = Path(self.get_dir(key))
+        file_name = self.get_name(key, pre=pre, ext=ext)
+        p = dir_path/file_name
+        try:
+            if ext=='.npy': return await np_load_async(p,allow_pickle=allow_pickle)
+            return await load_f(p)
+        except Exception as exc:
+            if show:
+                print(f'FileDB load Exception: {exc}')
+            return None
     
     def delete(self, key, pre='', ext='',show=False):
         """

{kardioutils-1.0.22 → kardioutils-1.0.24}/dl2050utils/fs.py

@@ -74,6 +74,20 @@ def pickle_load(p):
     except Exception as exc:
         print(str(exc))
         return 1
+    
+async def pickle_load_async(p):
+    p = Path(p)
+    p = p.with_suffix(".pickle")
+    if not p.is_file():
+        return None
+    def _load():
+        with open(p,"rb") as f:
+            return pickle.load(f)
+    try:
+        return await asyncio.to_thread(_load)
+    except Exception as exc:
+        print(str(exc))
+    
 
 
 def np_save(p, d, allow_pickle=True):
@@ -115,31 +129,19 @@ def np_load(p, allow_pickle=True):
         return 1
 
 
-async def np_load_async(p, allow_pickle=False):
-    """Asynchronously loads a NumPy array from a .npy file.
-
-    Args:
-        p (str or Path): The file path from where the array will be loaded.
-        allow_pickle (bool): If True, allows loading of object arrays.
-
-    Returns:
-        np.ndarray: The loaded array, or None if an error occurred.
-    """
-    p = Path(p)
-    p = p.with_suffix(".npy")
+async def np_load_async(p, allow_pickle=False, mmap_mode=None):
+    p = Path(p).with_suffix(".npy")
     if not p.is_file():
         return None
-    try:
-        async with aiofiles.open(p, mode="rb") as f:
-            buffer = await f.read()
-        f = io.BytesIO(buffer)
-        if allow_pickle:
-            d = np.load(f, allow_pickle=allow_pickle)
-            if d is None:
-                return None
+
+    def _load():
+        d = np.load(p, allow_pickle=allow_pickle, mmap_mode=mmap_mode)
+        if allow_pickle and isinstance(d, np.ndarray) and d.shape == () and d.dtype == object:
             return d.item()
-        else:
-            return np.load(f, allow_pickle=allow_pickle)
+        return d
+
+    try:
+        return await asyncio.to_thread(_load)
     except Exception:
         return None
 

{kardioutils-1.0.22 → kardioutils-1.0.24}/dl2050utils/rest.py

@@ -131,7 +131,6 @@ class ASGI_Server:
             Middleware(RestEndMiddleware, LOG=self.LOG, auth=auth),
         ]
         self.routes = auth.get_routes() + app.get_routes()
-    
 
     async def http_exception(self, request, exc):
         """Handles HTTP exceptions, returning a formatted error response.
@@ -176,8 +175,14 @@ class ASGI_Server:
     async def shutdown(self):
         """Logs and performs necessary shutdown tasks for the server."""
         self.LOG(2, 0, label="REST", label2="SHUTDOWN")
-    def create_app(self):
-        return Starlette(
+
+    def run(self, port=None):
+        """Runs the ASGI server on the specified port.
+
+        Args:
+            port (int, optional): Port to run the server. Defaults to self.port.
+        """
+        rest = Starlette(
             debug=DEBUG,
             exception_handlers=self.exception_handlers,
             middleware=self.middleware,
@@ -185,10 +190,8 @@ class ASGI_Server:
             on_shutdown=[self.shutdown],
             routes=self.routes,
         )
-
-    def run(self, port=None):
         port = port or self.port
-        uvicorn.run(self.create_app(), port=port, host="0.0.0.0", log_level="critical")
+        uvicorn.run(rest, port=port, host="0.0.0.0", log_level="critical")
 
 class RestStartMiddleware(BaseHTTPMiddleware):
     """Middleware to initialize request state.

{kardioutils-1.0.22 → kardioutils-1.0.24/kardioutils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kardioutils
-Version: 1.0.22
+Version: 1.0.24
 Summary: Utils lib
 Author: João Neto
 Author-email: joao.filipe.neto@gmail.com

kardioutils-1.0.22/dl2050utils/__version__.py

@@ -1 +0,0 @@
-version = "1.0.22"