streamlit-octostar-utils 0.5.0.dev6__tar.gz → 0.5.0.dev7__tar.gz

{streamlit_octostar_utils-0.5.0.dev6 → streamlit_octostar_utils-0.5.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamlit-octostar-utils
-Version: 0.5.0.dev6
+Version: 0.5.0.dev7
 Summary: 
 License: MIT
 License-File: LICENSE

{streamlit_octostar_utils-0.5.0.dev6 → streamlit_octostar_utils-0.5.0.dev7}/pyproject.toml

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

{streamlit_octostar_utils-0.5.0.dev6 → streamlit_octostar_utils-0.5.0.dev7}/streamlit_octostar_utils/api_crafter/nifi.py

@@ -45,6 +45,7 @@ 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")
+SOURCE_FRAGMENT_ENTITY_RELATIONSHIP = RelationshipName(name="is_child_fragment_of", type="otm")
 OS_RESERVED_FIELDS = [
     "os_entity_uid", "entity_id", "entity_type", "os_concept",
     "entity_label", "os_created_at", "os_created_by",
@@ -212,6 +213,7 @@ class NifiFragmenter(object):
             raise ValueError("Cannot have more than 100k entities for fragmentation")
         identifier = str(uuid.uuid4())
         root_uid = fragments[0].record["os_entity_uid"]
+        root_type = fragments[0].record["os_concept"]
         for i, entity in enumerate(fragments):
             travel_dict(entity.request["nifi_attributes"], fragmenter_keylist.split("."), "w")(
                 {"identifier": identifier, "count": count, "index": i}
@@ -225,7 +227,7 @@ class NifiFragmenter(object):
                 "fragments_stack"
             ]
             travel_dict(entity.request["config"]["fragment"], fragmenter_keylist.split("."), "w")(
-                {"identifier": identifier, "count": count, "index": i, "root_uid": root_uid}
+                {"identifier": identifier, "count": count, "index": i, "root_uid": root_uid, "root_type": root_type}
             )
 
     def push_defragment_strategy(fragment, defragmenter_config):
@@ -424,30 +426,34 @@ class NifiFragmenter(object):
         )
 
     @staticmethod
-    def resolve_source_entity_uid(entity, fragment_root_source=None) -> str:
-        """Resolve the source_entity_uid to use for child fragments.
+    def resolve_source_entity(entity, fragment_root_source=None) -> tuple:
+        """Resolve the source entity (recursive originator) for child fragments.
 
         When fragment_root_source is set (a fragment name or stack index),
-        the UID is looked up via entity.get_fragment_root_uid() -- this is
-        necessary when the current entity is a clone that may not be persisted.
-        Otherwise falls back to the entity's own UID.
+        the root is looked up via entity.get_fragment_root().  When it is
+        None and the entity is already fragmented, the oldest fragmentation
+        level's root is used (the original non-fragment ancestor).  Otherwise
+        falls back to the entity itself.
 
         Args:
             entity: A NifiEntity or NifiEntityProxy.
-            fragment_root_source: None to use the entity's own UID, an int
+            fragment_root_source: None for automatic resolution, an int
                 to index into the fragments stack, or a string fragmenter
                 keylist name.
 
         Returns:
-            The resolved source entity UID string.
+            (source_entity_uid, source_entity_type) tuple.
         """
-        if fragment_root_source is None:
-            return entity.record["os_entity_uid"]
-        try:
-            idx = int(fragment_root_source)
-            return entity.get_fragment_root_uid(idx)
-        except (ValueError, TypeError):
-            return entity.get_fragment_root_uid(fragment_root_source)
+        if fragment_root_source is not None:
+            try:
+                idx = int(fragment_root_source)
+                return entity.get_fragment_root(idx)
+            except (ValueError, TypeError):
+                return entity.get_fragment_root(fragment_root_source)
+        stack = entity.request.get("config", {}).get("fragment", {}).get("fragments_stack", [])
+        if stack:
+            return entity.get_fragment_root(-1)
+        return (entity.record["os_entity_uid"], entity.record["os_concept"])
 
 
 class NifiEntityBatch(object):
@@ -1089,7 +1095,17 @@ class NifiEntity(object):
             )
         return NifiFragmenter.get_fragment_info(self, key).get("index", 0) == 0
 
-    def get_fragment_root_uid(self, fragment_name_or_idx) -> str:
+    def get_fragment_root(self, fragment_name_or_idx) -> tuple:
+        """Return (root_uid, root_type) for a given fragmentation level.
+
+        Args:
+            fragment_name_or_idx: An int to index into fragments_stack
+                (e.g. -1 for the oldest fragmentation), or a string
+                fragmenter keylist name.
+
+        Returns:
+            (root_uid, root_type) tuple for the root entity at that level.
+        """
         fragment_config = self.request.get("config", {}).get("fragment", {})
         fragments_stack = fragment_config.get("fragments_stack", [])
         if isinstance(fragment_name_or_idx, int):
@@ -1114,7 +1130,10 @@ class NifiEntity(object):
             raise KeyError(
                 f"No root_uid found in fragment config for '{fragment_key}'"
             )
-        return fragment_data["root_uid"]
+        return (
+            fragment_data["root_uid"],
+            fragment_data.get("root_type", "os_fragment"),
+        )
 
     def to_json(self):
         if self.drop_on_output:
@@ -1408,6 +1427,7 @@ class NifiEntity(object):
         self,
         os_workspace,
         source_entity_uid,
+        source_entity_type,
         filename,
         filetype,
         file: Union[Contents, bytes],
@@ -1422,9 +1442,12 @@ class NifiEntity(object):
         next_fragment_uid=None,
         next_fragment_relationship_uid=None,
         next_fragment_relationship=NEXT_FRAGMENT_RELATIONSHIP,
+        source_entity_relationship_uid=None,
+        source_entity_relationship=SOURCE_FRAGMENT_ENTITY_RELATIONSHIP,
     ):
         fields = {
             **fields,
+            "os_parent_uid": self.record["os_entity_uid"],
             "source_entity_uid": source_entity_uid,
             "previous_entity_uid": previous_fragment_uid,
             "next_entity_uid": next_fragment_uid,
@@ -1440,9 +1463,14 @@ class NifiEntity(object):
             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"]
+        source_rel = self._add_relationship(
+            os_workspace, fragment_uid, fragment_type,
+            source_entity_uid, source_entity_type,
+            source_entity_relationship, {}, source_entity_relationship_uid,
+        )
+        prev_rel, next_rel = None, None
         if previous_fragment_uid:
             prev_rel = self._add_relationship(
                 os_workspace, fragment_uid, fragment_type,
@@ -1455,7 +1483,7 @@ class NifiEntity(object):
                 next_fragment_uid, os_entity_type,
                 next_fragment_relationship, {}, next_fragment_relationship_uid,
             )
-        return child_entity, child_rel, prev_rel, next_rel
+        return child_entity, child_rel, source_rel, prev_rel, next_rel
 
     def add_tag(self, os_workspace, name, group, order, color, fields={}):
         return self.add_child_entity(