Merge pull request #89 from serv-c/feature/blob

fix: correct filter function for child

Author: drgroot

servc/svc/__init__.py

@@ -13,6 +13,26 @@ class ComponentType(Enum):
     INTERFACE = "interface"
     DATABASE = "database"
     STORAGE = "storage"
+    BLOB = "blob"
+    LAKE = "lake"
+
+
+def findComp(
+    middleware: List[Middleware],
+    filter: ComponentType | None = None,
+    name: str | None = None,
+) -> Middleware:
+    for x in middleware:
+        if ((filter and x.type == filter) or (not filter)) and (
+            (name and x.name == name) or (not name)
+        ):
+            return x
+
+    if filter and not name:
+        raise Exception(f"{filter.value} not found")
+    elif name and filter:
+        raise Exception(f"{filter.value} with name {name} not found")
+    raise Exception(f"{name} not found")
 
 
 class Middleware:
@@ -66,7 +86,4 @@ def close(self):
     def getChild(
         self, filter: ComponentType | None = None, name: str | None = None
     ) -> Middleware:
-        for child in self._children:
-            if (filter and child.type == filter) or (name and child.name == name):
-                return child
-        raise Exception("Child of not found")
+        return findComp(self._children, filter, name)

servc/svc/com/http/blob.py

@@ -59,7 +59,9 @@ def _postMessage(self, extra_params: Dict | None = None):
 
             for filekey in list(request.files):
                 file = request.files[filekey]
-                container, remote_filename = self.get_upload_file_path(extra_params, file.filename)
+                container, remote_filename = self.get_upload_file_path(
+                    extra_params, file.filename
+                )
 
                 if file.filename != "":
                     self._blobStorage.put_file(

servc/svc/com/storage/blob/__init__.py

@@ -1,13 +1,16 @@
 from io import BytesIO
 from typing import List
 
+from servc.svc import ComponentType
 from servc.svc.com.storage import StorageComponent
 from servc.svc.config import Config
 
 
 class BlobStorage(StorageComponent):
     name: str = "blob"
 
+    _type: ComponentType = ComponentType.BLOB
+
     def __init__(self, config: Config):
         super().__init__(config)
 

servc/svc/com/storage/delta.py

@@ -11,6 +11,8 @@
 
 
 class Delta(Lake[DeltaTable]):
+    name: str = "delta"
+
     _storageOptions: Dict[str, str] = {}
 
     _location_prefix: str

servc/svc/com/storage/iceberg.py

@@ -17,6 +17,8 @@
 
 
 class IceBerg(Lake[Table]):
+    name: str = "iceberg"
+
     # _table
     _catalog: Catalog
 

servc/svc/com/storage/lake.py

@@ -3,6 +3,7 @@
 
 from pyarrow import RecordBatchReader, Schema, Table
 
+from servc.svc import ComponentType
 from servc.svc.com.storage import StorageComponent
 from servc.svc.config import Config
 
@@ -27,6 +28,8 @@ class LakeTable(TypedDict):
 class Lake(Generic[T], StorageComponent):
     name: str = "lake"
 
+    _type: ComponentType = ComponentType.LAKE
+
     _table: LakeTable | str
 
     _database: str