streamlit-octostar-utils 0.4.2.dev17__tar.gz → 0.4.2.dev19__tar.gz

{streamlit_octostar_utils-0.4.2.dev17 → streamlit_octostar_utils-0.4.2.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamlit-octostar-utils
-Version: 0.4.2.dev17
+Version: 0.4.2.dev19
 Summary: 
 License: MIT
 License-File: LICENSE

{streamlit_octostar_utils-0.4.2.dev17 → streamlit_octostar_utils-0.4.2.dev19}/pyproject.toml

@@ -5,7 +5,7 @@ include = '\.pyi?$'
 
 [tool.poetry]
 name = "streamlit-octostar-utils"
-version = "0.4.2-dev.17"
+version = "0.4.2-dev.19"
 description = ""
 license = "MIT"
 authors = ["Octostar"]

{streamlit_octostar_utils-0.4.2.dev17 → streamlit_octostar_utils-0.4.2.dev19}/streamlit_octostar_utils/api_crafter/contents.py

@@ -29,6 +29,7 @@ class ContentsLocation(Enum):
     MEMORY = "memory"
     WORKSPACE_ATTACHMENT = "workspace_attachment"
     TEMPORARY_ATTACHMENT = "temporary_attachment"
+    REFERENCE = "reference"
 
 
 class Contents(ABC):
@@ -283,6 +284,8 @@ class Contents(ABC):
                 return WorkspaceAttachmentContents._from_locator(locator, client)
             case ContentsLocation.TEMPORARY_ATTACHMENT.value:
                 return TemporaryAttachmentContents._from_locator(locator, client)
+            case ContentsLocation.REFERENCE.value:
+                return ReferenceContents._from_locator(locator, client)
             case _:
                 raise ValueError(f"Unknown contents location type: {location}")
     
@@ -954,3 +957,100 @@ class TemporaryAttachmentContents(Contents):
             filename=locator["filename"],
             client=client
         )
+
+
+class ReferenceContents(Contents):
+    """
+    Contents that delegates reads to one source and writes to another.
+
+    Useful for fragments that share their parent's attachment but need their
+    own write target for content syncing.  When the sync system calls
+    ``read()``, the data is read from ``read_source``. On ``write()``, the data is written to ``write_target``.
+
+    ``read_source`` is **not owned** by this instance — it will not be closed
+    or deleted, since it may be shared across multiple fragments.
+    """
+
+    def __init__(
+        self,
+        entity_type: Optional[str] = None,
+        filetype: Optional[str] = None,
+        *,
+        read_source: Optional[Contents] = None,
+        write_target: Optional[Contents] = None,
+        **kwargs
+    ):
+        super().__init__(entity_type, filetype, **kwargs)
+        self._read_source = read_source
+        self._write_target = write_target
+
+    # ==================== FileIO Interface ====================
+
+    def read(self, size: int = -1) -> bytes:
+        if self._read_source:
+            return self._read_source.read(size)
+        return b""
+
+    def write(self, b: bytes) -> int:
+        if self._write_target:
+            return self._write_target.write(b)
+        raise IOError("ReferenceContents has no write_target configured")
+
+    def seek(self, offset: int, whence: int = SEEK_SET) -> int:
+        if self._read_source:
+            return self._read_source.seek(offset, whence)
+        return 0
+
+    def tell(self) -> int:
+        if self._read_source:
+            return self._read_source.tell()
+        return 0
+
+    def flush(self):
+        if self._write_target:
+            self._write_target.flush()
+
+    def close(self):
+        if not self._closed:
+            if self._write_target:
+                self._write_target.close()
+            super().close()
+
+    def delete(self):
+        if self._write_target:
+            self._write_target.delete()
+
+    def truncate(self, size: Optional[int] = None) -> int:
+        if self._write_target:
+            return self._write_target.truncate(size)
+        return 0
+
+    def getvalue(self) -> bytes:
+        if self._read_source:
+            return self._read_source.getvalue()
+        return b""
+
+    # ==================== Locator Interface ====================
+
+    def to_locator(self) -> Dict[str, Any]:
+        locator: Dict[str, Any] = {
+            "location": ContentsLocation.REFERENCE.value,
+            "read_source": self._read_source.to_locator() if self._read_source else None,
+            "write_target": self._write_target.to_locator() if self._write_target else None,
+        }
+        if self._entity_type:
+            locator["entity_type"] = self._entity_type
+        if self._filetype:
+            locator["filetype"] = self._filetype
+        return locator
+
+    @staticmethod
+    def _from_locator(locator: Dict[str, Any], client=None) -> 'ReferenceContents':
+        read_source = Contents.from_locator(locator.get("read_source"), client)
+        write_target = Contents.from_locator(locator.get("write_target"), client)
+        return ReferenceContents(
+            entity_type=locator.get("entity_type"),
+            filetype=locator.get("filetype"),
+            read_source=read_source,
+            write_target=write_target,
+        )

{streamlit_octostar_utils-0.4.2.dev17 → streamlit_octostar_utils-0.4.2.dev19}/streamlit_octostar_utils/api_crafter/nifi.py

@@ -489,7 +489,7 @@ class NifiContextManager(object):
                     old_contents.delete()
                 except Exception:
                     pass
-            new_entity = target.last_flush_result or {}
+            new_entity = target.last_flush_result
             if new_entity:
                 file.record = {**record, **new_entity}
                 file.record["entity_id"] = file.record["os_entity_uid"]
@@ -737,14 +737,14 @@ class NifiEntity(object):
 
     @property
     def label(self):
-        # dummy ontology from our cached data, compatible with get_label()
         entity_type = self.record["entity_type"]
         parents = self.request["ontology_info"]["parents"]
         label_keys = self.request["ontology_info"]["label_keys"]
+        # dummy ontology from our cached data, compatible with get_label()
         ontology = {
             "concepts": {
+                **{p: {"parents": [], "labelKeys": []} for p in parents},
                 entity_type: {"parents": parents, "labelKeys": label_keys},
-                **{p: {"parents": [], "labelKeys": []} for p in parents}
             }
         }
         return get_label(self.record, ontology)
@@ -1075,7 +1075,7 @@ class NifiEntity(object):
             filename,
             filetype,
             file,
-            {**fields, "source_entity_uid": source_entity_uid},
+            fields,
             relationship,
             os_entity_uid,
             os_relationship_uid,

{streamlit_octostar_utils-0.4.2.dev17 → streamlit_octostar_utils-0.4.2.dev19}/streamlit_octostar_utils/ontology/inheritance.py

@@ -15,10 +15,10 @@ def get_label_keys(type, ontology):
     return list(label_keys.keys())
 
 def get_label(record, ontology):
-    if record.get("os_materialized_label"):
-        return record.get("os_materialized_label")
-    if record.get("os_label"):
-        return record.get("os_label")
+    if record.get("os_materialized_label") not in (None, ""):
+        return str(record.get("os_materialized_label"))
+    if record.get("os_custom_label") not in (None, ""):
+        return str(record.get("os_custom_label"))
     label_keys = get_label_keys(record["entity_type"], ontology)
     fields = [record.get(field) for field in label_keys]
     fields = [f for f in fields if f is not None]