streamlit-octostar-utils 0.4.2.dev3__tar.gz → 0.4.2.dev5__tar.gz

{streamlit_octostar_utils-0.4.2.dev3 → streamlit_octostar_utils-0.4.2.dev5}/PKG-INFO

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

{streamlit_octostar_utils-0.4.2.dev3 → streamlit_octostar_utils-0.4.2.dev5}/pyproject.toml

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

{streamlit_octostar_utils-0.4.2.dev3 → streamlit_octostar_utils-0.4.2.dev5}/streamlit_octostar_utils/api_crafter/contents.py

@@ -848,6 +848,9 @@ class TemporaryAttachmentContents(Contents):
             client=self._client
         )
         self._modified = False
+        self._buffer.close()
+        self._buffer = None
+        self._fully_loaded = False
     
     def close(self):
         if not self._closed:

{streamlit_octostar_utils-0.4.2.dev3 → streamlit_octostar_utils-0.4.2.dev5}/streamlit_octostar_utils/api_crafter/nifi.py

@@ -41,6 +41,8 @@ GENERIC_RELATIONSHIP = RelationshipName(name="related_to", type="mtm")
 FILE_RELATIONSHIP = RelationshipName(name="generator_of", type="mtm")
 TAG_RELATIONSHIP = RelationshipName(name="has_tag", type="mtm")
 FRAGMENT_RELATIONSHIP = RelationshipName(name="is_fragment_of", type="otm")
+PREVIOUS_FRAGMENT_RELATIONSHIP = RelationshipName(name="has_previous_fragment", type="otm")
+NEXT_FRAGMENT_RELATIONSHIP = RelationshipName(name="has_next_fragment", type="otm")
 
 
 class NifiProxyEntityModel(BaseModel):
@@ -951,6 +953,47 @@ class NifiEntity(object):
         self.children.append(child_entity_proxy)
         return child_entity_proxy
 
+    def _add_child_attachable(
+        self,
+        os_workspace,
+        filename,
+        filetype,
+        file: Union[Contents, bytes],
+        fields={},
+        relationship: RelationshipName = FILE_RELATIONSHIP,
+        os_entity_uid=None,
+        os_relationship_uid=None,
+        os_entity_type=FILE_ENTITY_NAME,
+    ):
+        child_entity, child_rel = self.add_child_entity(
+            os_workspace,
+            os_entity_type,
+            {
+                **fields,
+                "os_item_name": filename,
+                "os_item_content_type": filetype,
+                "os_has_attachment": True,
+            },
+            relationship,
+            os_entity_uid,
+            os_relationship_uid,
+        )
+        if isinstance(file, Contents):
+            child_entity._contents = file
+        else:
+            temp_filename = f"tmp_{child_entity.record['os_entity_uid']}"
+            temp_contents = TemporaryAttachmentContents(
+                entity_type=os_entity_type,
+                filetype=filetype,
+                filename=temp_filename,
+                client=self.context.client,
+                initial_data=file,
+            )
+            temp_contents.flush()
+            child_entity._contents = temp_contents
+        child_entity.request["contents_pointer"] = child_entity._contents.to_locator()
+        return child_entity, child_rel
+
     def add_mtm_relationship(
         self,
         os_entity_uid_from,
@@ -1002,29 +1045,19 @@ class NifiEntity(object):
         relationship: RelationshipName = GENERIC_RELATIONSHIP,
         os_entity_uid=None,
         os_relationship_uid=None,
+        relationship_fields={},
     ):
         child_entity = self._add_entity(os_workspace, entity_type, fields, os_entity_uid)
-        if relationship.type == "mtm":
-            child_rel = self.add_mtm_relationship(
-                self.record["os_entity_uid"],
-                self.record["os_concept"],
-                child_entity.record["os_entity_uid"],
-                child_entity.record["os_concept"],
-                relationship.name,
-                os_workspace,
-                {},
-                os_relationship_uid,
-            )
-        elif relationship.type == "otm":
-            child_rel = self.add_otm_relationship(
-                self.record["os_entity_uid"],
-                self.record["os_concept"],
-                child_entity.record["os_entity_uid"],
-                child_entity.record["os_concept"],
-                relationship.name,
-            )
-        else:
-            raise ValueError(f"relationship.type is invalid! {relationship.type}")
+        child_rel = self._add_relationship(
+            os_workspace,
+            self.record["os_entity_uid"],
+            self.record["os_concept"],
+            child_entity.record["os_entity_uid"],
+            child_entity.record["os_concept"],
+            relationship,
+            relationship_fields,
+            os_relationship_uid,
+        )
         return child_entity, child_rel
 
     def add_child_file(
@@ -1040,40 +1073,30 @@ class NifiEntity(object):
         os_relationship_uid=None,
         os_entity_type=FILE_ENTITY_NAME,
     ):
-        child_entity, child_rel = self.add_child_entity(
+        return self._add_child_attachable(
             os_workspace,
-            os_entity_type,
-            {
-                **fields,
-                "os_item_name": filename,
-                "os_item_content_type": filetype,
-                "os_has_attachment": True,
-                "os_parent_folder": os_parent_folder,
-            },
+            filename,
+            filetype,
+            file,
+            {**fields, "os_parent_folder": os_parent_folder},
             relationship,
             os_entity_uid,
             os_relationship_uid,
+            os_entity_type
         )
-        if isinstance(file, Contents):
-            child_entity._contents = file
+
+    def _add_relationship(self, os_workspace, from_uid, from_type, to_uid, to_type, rel, relationship_fields={}, rel_uid=None):
+        if rel.type == "mtm":
+            return self.add_mtm_relationship(from_uid, from_type, to_uid, to_type, rel.name, os_workspace, relationship_fields, rel_uid)
+        elif rel.type == "otm":
+            return self.add_otm_relationship(from_uid, from_type, to_uid, to_type, rel.name)
         else:
-            temp_filename = f"tmp_{child_entity.record['os_entity_uid']}"
-            temp_contents = TemporaryAttachmentContents(
-                entity_type=os_entity_type,
-                filetype=filetype,
-                filename=temp_filename,
-                client=self.context.client,
-                initial_data=file,
-            )
-            temp_contents.flush()
-            child_entity._contents = temp_contents
-        child_entity.request["contents_pointer"] = child_entity._contents.to_locator()
-        return child_entity, child_rel
+            raise ValueError(f"relationship.type is invalid! {rel.type}")
 
     def add_child_fragment(
         self,
         os_workspace,
-        os_parent_folder,
+        source_entity_uid,
         filename,
         filetype,
         file: Union[Contents, bytes],
@@ -1082,19 +1105,42 @@ class NifiEntity(object):
         os_entity_uid=None,
         os_relationship_uid=None,
         os_entity_type=FRAGMENT_ENTITY_NAME,
+        previous_fragment_uid=None,
+        previous_fragment_relationship_uid=None,
+        previous_fragment_relationship=PREVIOUS_FRAGMENT_RELATIONSHIP,
+        next_fragment_uid=None,
+        next_fragment_relationship_uid=None,
+        next_fragment_relationship=NEXT_FRAGMENT_RELATIONSHIP,
     ):
-        return self.add_child_file(
+        child_entity, child_rel = self._add_child_attachable(
             os_workspace,
-            os_parent_folder,
             filename,
             filetype,
             file,
-            fields,
+            {**fields, "source_entity_uid": source_entity_uid},
             relationship,
             os_entity_uid,
             os_relationship_uid,
             os_entity_type,
         )
+        prev_rel, next_rel = None, None
+        fragment_uid = child_entity.record["os_entity_uid"]
+        fragment_type = child_entity.record["os_concept"]
+        if previous_fragment_uid:
+            prev_rel = previous_fragment_relationship or PREVIOUS_FRAGMENT_RELATIONSHIP
+            self._add_relationship(
+                os_workspace, fragment_uid, fragment_type,
+                previous_fragment_uid, os_entity_type,
+                previous_fragment_relationship, {}, previous_fragment_relationship_uid,
+            )
+        if next_fragment_uid:
+            next_rel = next_fragment_relationship or NEXT_FRAGMENT_RELATIONSHIP
+            self._add_relationship(
+                os_workspace, fragment_uid, fragment_type,
+                next_fragment_uid, os_entity_type,
+                next_fragment_relationship, {}, next_fragment_relationship_uid,
+            )
+        return child_entity, child_rel, prev_rel, next_rel
 
     def add_tag(self, os_workspace, name, group, order, color, fields={}):
         return self.add_child_entity(