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

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

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

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

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

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

@@ -5,18 +5,16 @@ from contextlib import contextmanager
 import json
 import jwt
 from typing import List, Union, Optional, Callable
-import base64
 from pydantic import BaseModel, ConfigDict, Field
 import itertools
-import asyncio
 from enum import Enum
-from typing import Dict, Any
+from typing import Dict, Any, Literal
 from datetime import datetime, timezone, timedelta
 from fastapi import Request
 from fastapi.responses import JSONResponse
 from starlette.exceptions import HTTPException as StarletteHTTPException
 
-from octostar.utils.workspace import read_file, upsert_entities, write_file
+from octostar.utils.workspace import upsert_entities, write_file
 from octostar.utils.ontology import fetch_ontology_data
 from octostar.utils.workspace.permissions import get_permissions, PermissionLevel
 from octostar.client import make_client
@@ -26,26 +24,23 @@ from ..core.dict import recursive_update_dict, travel_dict, jsondict_hash
 from ..core.timestamp import now, string_to_datetime
 from .fastapi import DefaultErrorRoute, Route
 from ..ontology.inheritance import is_child_concept as is_child_concept_fn, get_label_keys
-from .contents import Contents, MemoryContents, WorkspaceAttachmentContents, TemporaryAttachmentContents, ContentsLocation
+from .contents import Contents, WorkspaceAttachmentContents, TemporaryAttachmentContents, ContentsLocation
+
+
+class RelationshipName(BaseModel):
+    name: str
+    type: Literal["mtm", "otm"]
+
 
 RELATIONSHIP_ENTITY_NAME = "os_relationship"
 LOCAL_RELATIONSHIP_ENTITY_NAME = "os_workspace_relationship"
 FILE_ENTITY_NAME = "os_file"
-GENERIC_RELATIONSHIP_NAME = "related_to"
-FILE_RELATIONSHIP_NAME = "generator_of"
-TAG_RELATIONSHIP_NAME = "has_tag"
 TAG_ENTITY_NAME = "os_tag"
-
-
-def safe_async_run(coro):
-    try:
-        loop = asyncio.get_event_loop()
-        if loop.is_running():
-            return asyncio.ensure_future(coro)
-        else:
-            return asyncio.run(coro)
-    except RuntimeError:
-        return asyncio.run(coro)
+FRAGMENT_ENTITY_NAME = "os_fragment"
+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")
 
 
 class NifiProxyEntityModel(BaseModel):
@@ -397,10 +392,6 @@ class NifiContextManager(object):
 
     @contextmanager
     def reindex_lock(self, entities: List[Union[dict, "NifiEntity"]], timeout: int = 7200):
-        """Lock entities to prevent reindexing during processing.
-        
-        Sets do_not_reindex_at to a future time on entry, resets on exit.
-        """
         if not entities:
             yield
             return
@@ -579,8 +570,7 @@ class NifiContextManager(object):
                             target["os_workspace"],
                             target["os_concept"],
                             target,
-                            os_relationship_name=rel["os_relationship_name"],
-                            os_relationship_type=rel_type,
+                            relationship=RelationshipName(name=rel["os_relationship_name"], type=rel_type),
                         )
                         child_entity.record = {**child_entity.record, **target}
                         child_entity.record["entity_id"] = child_entity.record[
@@ -974,7 +964,7 @@ class NifiEntity(object):
     ):
         return self._add_entity(
             os_relationship_workspace,
-            (LOCAL_RELATIONSHIP_ENTITY_NAME if os_relationship_workspace else RELATIONSHIP_ENTITY_NAME),
+            LOCAL_RELATIONSHIP_ENTITY_NAME,
             {
                 **relationship_fields,
                 "os_entity_uid_from": os_entity_uid_from,
@@ -1009,33 +999,32 @@ class NifiEntity(object):
         os_workspace,
         entity_type,
         fields,
-        os_relationship_name=GENERIC_RELATIONSHIP_NAME,
-        os_relationship_type="mtm",
+        relationship: RelationshipName = GENERIC_RELATIONSHIP,
         os_entity_uid=None,
         os_relationship_uid=None,
     ):
         child_entity = self._add_entity(os_workspace, entity_type, fields, os_entity_uid)
-        if os_relationship_type == "mtm":
+        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"],
-                os_relationship_name,
+                relationship.name,
                 os_workspace,
                 {},
                 os_relationship_uid,
             )
-        elif os_relationship_type == "otm":
+        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"],
-                os_relationship_name,
+                relationship.name,
             )
         else:
-            raise ValueError(f"os_relationship_type is invalid! {os_relationship_type}")
+            raise ValueError(f"relationship.type is invalid! {relationship.type}")
         return child_entity, child_rel
 
     def add_child_file(
@@ -1046,14 +1035,14 @@ class NifiEntity(object):
         filetype,
         file: Union[Contents, bytes],
         fields={},
-        os_relationship_name=FILE_RELATIONSHIP_NAME,
-        os_relationship_type="mtm",
+        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,
-            FILE_ENTITY_NAME,
+            os_entity_type,
             {
                 **fields,
                 "os_item_name": filename,
@@ -1061,8 +1050,7 @@ class NifiEntity(object):
                 "os_has_attachment": True,
                 "os_parent_folder": os_parent_folder,
             },
-            os_relationship_name,
-            os_relationship_type,
+            relationship,
             os_entity_uid,
             os_relationship_uid,
         )
@@ -1071,7 +1059,7 @@ class NifiEntity(object):
         else:
             temp_filename = f"tmp_{child_entity.record['os_entity_uid']}"
             temp_contents = TemporaryAttachmentContents(
-                entity_type=FILE_ENTITY_NAME,
+                entity_type=os_entity_type,
                 filetype=filetype,
                 filename=temp_filename,
                 client=self.context.client,
@@ -1082,13 +1070,38 @@ class NifiEntity(object):
         child_entity.request["contents_pointer"] = child_entity._contents.to_locator()
         return child_entity, child_rel
 
+    def add_child_fragment(
+        self,
+        os_workspace,
+        os_parent_folder,
+        filename,
+        filetype,
+        file: Union[Contents, bytes],
+        fields={},
+        relationship: RelationshipName = FRAGMENT_RELATIONSHIP,
+        os_entity_uid=None,
+        os_relationship_uid=None,
+        os_entity_type=FRAGMENT_ENTITY_NAME,
+    ):
+        return self.add_child_file(
+            os_workspace,
+            os_parent_folder,
+            filename,
+            filetype,
+            file,
+            fields,
+            relationship,
+            os_entity_uid,
+            os_relationship_uid,
+            os_entity_type,
+        )
+
     def add_tag(self, os_workspace, name, group, order, color, fields={}):
         return self.add_child_entity(
             os_workspace,
-            "os_tag",
-            {**fields,"name": name, "group": group, "order": order, "color": color},
-            TAG_RELATIONSHIP_NAME,
-            "mtm",
+            TAG_ENTITY_NAME,
+            {**fields, "name": name, "group": group, "order": order, "color": color},
+            TAG_RELATIONSHIP,
         )
 
     def add_annotations(