altcodepro-polydb-python 2.3.9__py3-none-any.whl → 2.3.10__py3-none-any.whl

polydb/cloudDatabaseFactory.py

@@ -4,6 +4,8 @@ import os
 import threading
 from typing import Dict, List, Optional
 
+from .base import SharedFilesAdapter
+
 from .adapters.AzureFileStorageAdapter import AzureFileStorageAdapter
 from .adapters.EFSAdapter import EFSAdapter
 from .adapters.PostgreSQLAdapter import PostgreSQLAdapter
@@ -44,7 +46,6 @@ from .adapters.VercelQueueAdapter import VercelQueueAdapter
 from .adapters.BlockchainQueueAdapter import BlockchainQueueAdapter
 from .adapters.SQSAdapter import SQSAdapter
 
-
 # ============================================================
 # FACTORY
 # ============================================================
@@ -106,7 +107,9 @@ class CloudDatabaseFactory:
     # OBJECT STORAGE
     # --------------------------------------------------------
     def get_object_storage(
-        self, name: str = "azure"
+        self,
+        name: str = "azure",
+        container_name: Optional[str] = None,
     ) -> (
         AzureBlobStorageAdapter
         | S3CompatibleAdapter
@@ -115,13 +118,12 @@ class CloudDatabaseFactory:
         | BlockchainBlobAdapter
     ):
         with self._lock:
-            if name in self.instances:
-                return self.instances[name]
-
-            cfg = self.configs.get(name)
-            if not cfg:
-                cfg = StorageConfig(provider=self.provider, name=name)
+            # cache per (name, container) so different containers don't collide
+            cache_key = f"object::{name}::{container_name or ''}"
+            if cache_key in self.instances:
+                return self.instances[cache_key]
 
+            cfg = self.configs.get(name) or StorageConfig(provider=self.provider, name=name)
             provider = cfg.provider
 
             # ---------------- AZURE ----------------
@@ -130,11 +132,12 @@ class CloudDatabaseFactory:
 
                 connection_string = None
                 container = None
-
                 if isinstance(cfg, AzureStorageConfig):
                     connection_string = cfg.connection_string
                     container = cfg.container
 
+                container = container_name or container  # per-call overrides config/env
+
                 instance = AzureBlobStorageAdapter(
                     connection_string=connection_string or "",
                     container_name=container or "",
@@ -157,7 +160,7 @@ class CloudDatabaseFactory:
                     bucket = cfg.bucket
                     project_id = cfg.project_id
                     endpoint = cfg.endpoint
-
+                bucket = container_name or bucket  # container_name doubles as bucket override
                 instance = GCPStorageAdapter(
                     project_id=project_id, endpoint=endpoint, bucket_name=bucket
                 )
@@ -168,21 +171,16 @@ class CloudDatabaseFactory:
 
                 token = None
                 timeout = 10
-
                 if isinstance(cfg, VercelStorageConfig):
                     token = cfg.token
                     timeout = cfg.timeout
-
                 instance = VercelBlobAdapter(token=token or "", timeout=timeout)
 
             # ---------------- BLOCKCHAIN ----------------
             elif provider == CloudProvider.BLOCKCHAIN:
                 from .adapters.BlockchainBlobAdapter import BlockchainBlobAdapter
 
-                ipfs_url = None
-                if isinstance(cfg, BlockchainStorageConfig):
-                    ipfs_url = cfg.ipfs_url
-
+                ipfs_url = cfg.ipfs_url if isinstance(cfg, BlockchainStorageConfig) else None
                 instance = BlockchainBlobAdapter(ipfs_url=ipfs_url)
 
             # ---------------- DEFAULT ----------------
@@ -192,7 +190,7 @@ class CloudDatabaseFactory:
                 self.logger.warning(f"Fallback to S3-compatible for provider={provider}")
                 instance = S3CompatibleAdapter()
 
-            self.instances[name] = instance
+            self.instances[cache_key] = instance
             return instance
 
     # --------------------------------------------------------
@@ -440,82 +438,55 @@ class CloudDatabaseFactory:
             self.instances["queue"] = instance
             return instance
 
-    def get_files(
-        self, name: str = "files"
-    ) -> (
-        AzureFileStorageAdapter
-        | EFSAdapter
-        | GCPStorageAdapter
-        | AzureBlobStorageAdapter
-        | S3CompatibleAdapter
-        | VercelBlobAdapter
-        | BlockchainBlobAdapter
-    ):
+    def get_files(self, name: str = "files"):
         with self._lock:
             if name in self.instances:
                 return self.instances[name]
 
-            cfg = self.configs.get(name)
-            if not cfg:
-                cfg = StorageConfig(provider=self.provider, name=name)
+            cfg = self.configs.get(name) or StorageConfig(provider=self.provider, name=name)
 
-            # ---------------- AZURE FILE STORAGE ----------------
             if cfg.provider == CloudProvider.AZURE:
                 from .adapters.AzureFileStorageAdapter import AzureFileStorageAdapter
 
                 connection_string = ""
                 share_name = ""
-
                 if isinstance(cfg, AzureFileConfig):
                     connection_string = cfg.connection_string or ""
                     share_name = cfg.share_name or ""
-
                 instance = AzureFileStorageAdapter(
-                    connection_string=connection_string,
-                    share_name=share_name,
+                    connection_string=connection_string, share_name=share_name
                 )
 
-            # ---------------- AWS EFS ----------------
             elif cfg.provider == CloudProvider.AWS:
                 from .adapters.EFSAdapter import EFSAdapter
 
-                mount_point = None
-                if isinstance(cfg, EFSFileConfig):
-                    mount_point = cfg.mount_path
-
-                instance = EFSAdapter(
-                    mount_point=mount_point or os.getenv("EFS_MOUNT_POINT", "/mnt/efs")
-                )
+                mount_point = cfg.mount_path if isinstance(cfg, EFSFileConfig) else None
+                instance = EFSAdapter(mount_point=mount_point or "")
 
-            # ---------------- GCP STORAGE (FILES VIA BUCKET) ----------------
             elif cfg.provider == CloudProvider.GCP:
-                from .adapters.GCPStorageAdapter import GCPStorageAdapter
+                from .adapters.GCPFilestoreAdapter import FilestoreAdapter
 
-                project_id = os.getenv("GOOGLE_CLOUD_PROJECT", "")
-                endpoint = os.getenv("GCP_STORAGE_ENDPOINT")  # optional (for emulator)
-                bucket = None
+                mount_point = getattr(cfg, "mount_path", None)
+                instance = FilestoreAdapter(mount_point=mount_point or "")
 
-                if isinstance(cfg, GCPFileConfig):
-                    bucket = cfg.bucket
-
-                instance = GCPStorageAdapter(
-                    project_id=project_id,
-                    endpoint=endpoint,
-                    bucket_name=bucket,
-                )
-
-            # ---------------- VERCEL (fallback to blob) ----------------
             elif cfg.provider == CloudProvider.VERCEL:
-                # Vercel has no file system → reuse blob adapter
-                instance = self.get_object_storage(name)
+                from .adapters.VercelFileAdapter import VercelFileAdapter
 
-            # ---------------- BLOCKCHAIN ----------------
-            elif cfg.provider == CloudProvider.BLOCKCHAIN:
-                raise NotImplementedError("File storage not supported for blockchain")
+                instance = VercelFileAdapter()
 
-            # ---------------- DEFAULT ----------------
+            elif cfg.provider == CloudProvider.BLOCKCHAIN:
+                from .adapters.BlockchainFileAdapter import BlockchainFileAdapter
+
+                instance = BlockchainFileAdapter(
+                    chain=getattr(cfg, "chain", None),
+                    rpc_url=getattr(cfg, "rpc_url", None),
+                    private_key=getattr(cfg, "private_key", None),
+                    contract_address=getattr(cfg, "contract_address", None),
+                    contract_abi=getattr(cfg, "contract_abi", None),
+                    ipfs_url=getattr(cfg, "ipfs_url", None),
+                )
             else:
-                raise NotImplementedError(f"File storage not supported for {self.provider.value}")
+                raise NotImplementedError(f"File storage not supported for {cfg.provider.value}")
 
             self.instances[name] = instance
             return instance

polydb/databaseFactory.py

@@ -554,6 +554,7 @@ class DatabaseFactory:
         after_plain = None
         success = False
         error: Optional[str] = None
+
         def _op() -> JsonDict:
             nonlocal after_plain, success
             if self._is_sql(meta, engine_override):
@@ -866,8 +867,11 @@ class DatabaseFactory:
         media_type: Optional[str] = None,
         metadata: Optional[Dict[str, Any]] = None,
         storage_name: str = "azure",
+        container_name: Optional[str] = None,
     ) -> str:
-        storage = self._engines[0].cloud_factory.get_object_storage(storage_name)
+        storage = self._engines[0].cloud_factory.get_object_storage(
+            storage_name, container_name=container_name
+        )
         return storage.put(
             key=key,
             data=data,
@@ -877,16 +881,28 @@ class DatabaseFactory:
             metadata=metadata or {},
         )
 
-    def download_blob(self, key: str, *, storage_name: str = "azure") -> Optional[bytes]:
-        storage = self._engines[0].cloud_factory.get_object_storage(storage_name)
+    def download_blob(
+        self, key: str, *, storage_name: str = "azure", container_name: Optional[str] = None
+    ) -> Optional[bytes]:
+        storage = self._engines[0].cloud_factory.get_object_storage(
+            storage_name, container_name=container_name
+        )
         return storage.get(key)
 
-    def delete_blob(self, key: str, *, storage_name: str = "azure") -> bool:
-        storage = self._engines[0].cloud_factory.get_object_storage(storage_name)
+    def delete_blob(
+        self, key: str, *, storage_name: str = "azure", container_name: Optional[str] = None
+    ) -> bool:
+        storage = self._engines[0].cloud_factory.get_object_storage(
+            storage_name, container_name=container_name
+        )
         return storage.delete(key)
 
-    def list_blob(self, prefix: str = "", *, storage_name: str = "azure") -> List[str]:
-        storage = self._engines[0].cloud_factory.get_object_storage(storage_name)
+    def list_blob(
+        self, prefix: str = "", *, storage_name: str = "azure", container_name: Optional[str] = None
+    ) -> List[str]:
+        storage = self._engines[0].cloud_factory.get_object_storage(
+            storage_name, container_name=container_name
+        )
         return storage.list(prefix)
 
     # ══════════════════════════════════════════════════════════════════════

altcodepro_polydb_python-2.3.9.dist-info/RECORD

@@ -1,58 +0,0 @@
-altcodepro_polydb_python-2.3.9.dist-info/licenses/LICENSE,sha256=9X8GLocsBwy-5aR5JGOt2SAMDDPs9Qv-YnqmHBHOXrw,1067
-polydb/PolyDB.py,sha256=p9eDdvBGosE4fNSSAbtq3tHObdKZ-C2V2Q_ia39Ackk,23397
-polydb/__init__.py,sha256=UhUzfSvmMgKbV2tSME1ooIyfshIBi7_WyU4xl1tWWiA,1454
-polydb/advanced_query.py,sha256=cxMB-EB-qT3bWXJlhmjnMCUtrzogORWyoEfS50Dy7go,4280
-polydb/batch.py,sha256=_DjWZa1ZXYSk6MLKqFe0eT7SYVRZtYNqZb9bI8Y2sao,4566
-polydb/cache.py,sha256=JBXF1XEK-fY80ar8SDE893Z1Z116YtXAEG0PaJ0Nkcw,7658
-polydb/cloudDatabaseFactory.py,sha256=E5tFJBNJuwwdJ4sqjr3IgUTpUWpXoa-UarIv8pLB7lY,18121
-polydb/databaseFactory.py,sha256=LtRxQ5R6A4XegqSsHI26lbtTsmrzpVLvKIqn57BAjIg,40447
-polydb/decorators.py,sha256=Rzk8Bj8wHi8YFtc06HEYT5r_Vqqn7TGaCtR5qvHdY-E,420
-polydb/errors.py,sha256=rcFeBH0cenjJ86v0cmDc2Yjj4R019pLCBcTeSC4qps4,1428
-polydb/json_safe.py,sha256=R5PrqAGirqjYKPyy-8KH-lSXjLH0FPr2TSGozy4eheU,149
-polydb/models.py,sha256=9uu_BaJ95194n-vnd0Rx9KLc6aPS-mxn10P4W5grUcI,8155
-polydb/monitoring.py,sha256=UMm3ybyRJjAQi-prXXMLl9zuHhnhMnYBzMD3XWK66y8,9571
-polydb/multitenancy.py,sha256=9kyY98RpKg8xDy9ejB_MyV_YzF7eZd4uxashw5S8vlg,6408
-polydb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-polydb/query.py,sha256=L13FL8A06HxT0F_LGlY9IBh-62j1VWZrv2Tu_wS-Ed0,6348
-polydb/registry.py,sha256=RD_elvFXcmhTdCyZDm2f3ej0elxqhArnSJ2aO9k5VCU,2352
-polydb/retry.py,sha256=etsj8MGo1WMvlcZMzWmFELAsWCRs-XPEuJe6K76QgbM,2548
-polydb/schema.py,sha256=VrOayX6V6AD2Qh3-lm4ZVPTpI24e4V52IYheZf2rNQ4,5812
-polydb/security.py,sha256=-bXdRjFmvq4X6ie6FrZMcO9ZbgjWFkNySSbRwFt1X1Q,16281
-polydb/types.py,sha256=XB_85Un8_aWt4dSfpjIGotHbK3KBY2WurQGXr9EOxWY,2992
-polydb/utils.py,sha256=G_ki5zKr5rGPgpFQM1CTq6twQd5OytaHKfet267MftM,1662
-polydb/validation.py,sha256=a1o1d02k3c6PWQwkBbw_0nEmIgrdB5RR8OcpNQMn4cA,4810
-polydb/adapters/AzureBlobStorageAdapter.py,sha256=iNscCIeoWy4YJo3IbI7gNam-NUT7t45ayrlPnYfqlCQ,6409
-polydb/adapters/AzureFileStorageAdapter.py,sha256=OuZY5P-FTQ36954obJN65oSMqmW3d-7QBmXxVGX0lds,6086
-polydb/adapters/AzureQueueAdapter.py,sha256=5tslwI0DgvMeb20w57aVSSSKiuCJEKrYjN0kGuFcdUI,5276
-polydb/adapters/AzureTableStorageAdapter.py,sha256=FEND2V8-V-CGoTj0hWz8C7FIsA17wr-tTkXidcyjqbM,23345
-polydb/adapters/BlockchainBlobAdapter.py,sha256=BXSDT6rDGGE04qM2-dVNAeWk-VcF82JGHAdUJeYHCbI,3320
-polydb/adapters/BlockchainKVAdapter.py,sha256=5Egic8QyulgYcy9O12iWKq2EDyVEvnXp_ereYgIvbHk,4546
-polydb/adapters/BlockchainQueueAdapter.py,sha256=K01klT8Eu8c-y1G9Sg2r0PIjay_at9x27kCTTEHPkNY,4179
-polydb/adapters/DynamoDBAdapter.py,sha256=MSgIk43WT5z0fbBpZJ_5uLq0CfZS2YRfwX06-b_sl3o,18235
-polydb/adapters/EFSAdapter.py,sha256=z6ZarHlG_3HMHEk3yVXdJT2vlc8xleML1vEhxizMbdk,1723
-polydb/adapters/FirestoreAdapter.py,sha256=cvDOlxrEI8u81kWkjhazqb2rG4Q4I8Ftoho_cbx9nZQ,13947
-polydb/adapters/GCPPubSubAdapter.py,sha256=YFkQkTBezjoV56FsIVoNjQ0cqIo3uYzUF_fMf7CCV4M,8759
-polydb/adapters/GCPStorageAdapter.py,sha256=B8i9k2rCuH8NJ-wU4RpijbiCx_O_EbUeQXyhcjNdgHU,7758
-polydb/adapters/MongoDBAdapter.py,sha256=vX3SAHDLbTnHABGesES9N-gYSQqPqdqFLJgd7pYWZzw,7471
-polydb/adapters/PostgreSQLAdapter.py,sha256=n6fGqD86nOG86FWjMAz_QpDQEvjGr5PcVrF4iOxWjDg,24858
-polydb/adapters/S3Adapter.py,sha256=2TqdtTGYKApMFbj6ssbH5JMMM4JUxWzCDdgVJSa_o-w,7547
-polydb/adapters/S3CompatibleAdapter.py,sha256=k_25W3hUjTJ-3v1dcMev-jY3oypT8s3tPz3lRdp5Gb0,5642
-polydb/adapters/SQSAdapter.py,sha256=qQeMIlvJAkpY0M7Pf1E5sdZxnrLKx_cuoheIj_irNSc,5759
-polydb/adapters/VercelBlobAdapter.py,sha256=Hu1u8vE-3rvJMBDotnPKeRoVaH1Vl9PdM1hBKphgj2w,6983
-polydb/adapters/VercelKVAdapter.py,sha256=QZxRkuYzVNWFCEFaJPSph8YEAut-YtlXPqbCt0JlROI,8647
-polydb/adapters/VercelQueueAdapter.py,sha256=cWtPaMIWCako0HHr_rzAE6vMLugSR6zBXqp3VP9MXwY,2375
-polydb/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-polydb/audit/AuditStorage.py,sha256=A5HLhkWG8kef_caUuWakJf4fSK_r03NN4JLbbK7N55c,4949
-polydb/audit/__init__.py,sha256=m_GE7gjLw00zfHX-1SpkF7QZpRE72HO699ZzKzqD3kc,244
-polydb/audit/context.py,sha256=-A1FMtmr-2snVAHpTrVT80u-D_MCaqX6AoV4Ku2bz_o,1955
-polydb/audit/manager.py,sha256=KzaaOf5bDfr4M-CkCAZBG_U_4xIBCKDLRAf3hsm-DAk,1236
-polydb/audit/models.py,sha256=BgkSEQRbjbourxyGcEeJYIYzozwTM-pqTiSOM_BhWHs,2256
-polydb/base/NoSQLKVAdapter.py,sha256=oa3MT7Z6E5zsF6mDeqjaMfefScKXJgne79LkB7dN8ZA,11557
-polydb/base/ObjectStorageAdapter.py,sha256=mNdJnhoB3VqSCQvmcoel5PohrVQw7Nrajdd5suGBOvQ,2242
-polydb/base/QueueAdapter.py,sha256=jFgyG-SUK4nhRNxm2NbzUbwnA9b_5iAC-ikLSUpXRwk,799
-polydb/base/SharedFilesAdapter.py,sha256=hvmdNNhNxpN46Ob9RLAi8l46GB6JolYyZWnAMuaJ86g,708
-polydb/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-altcodepro_polydb_python-2.3.9.dist-info/METADATA,sha256=CG1nVTpRxMSaQLlZRDzAf9eYTmyD9Lmuqkvoy4kVw3M,11910
-altcodepro_polydb_python-2.3.9.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-altcodepro_polydb_python-2.3.9.dist-info/top_level.txt,sha256=WgLFWJoYjUhwvyPxJFl6jYLrVFuBJDX3OABf4ocwk_E,7
-altcodepro_polydb_python-2.3.9.dist-info/RECORD,,