streamlit-octostar-utils 0.5.0.dev19__tar.gz → 0.5.2.dev1__tar.gz

{streamlit_octostar_utils-0.5.0.dev19 → streamlit_octostar_utils-0.5.2.dev1}/PKG-INFO

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

{streamlit_octostar_utils-0.5.0.dev19 → streamlit_octostar_utils-0.5.2.dev1}/pyproject.toml

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

{streamlit_octostar_utils-0.5.0.dev19 → streamlit_octostar_utils-0.5.2.dev1}/streamlit_octostar_utils/api_crafter/nifi.py

@@ -17,7 +17,6 @@ from starlette.exceptions import HTTPException as StarletteHTTPException
 
 from octostar.utils.workspace import upsert_entities
 from octostar.utils.ontology import fetch_ontology_data
-from octostar.utils.workspace.permissions import get_permissions, PermissionLevel
 from octostar.utils.pipeline import update_processing_status
 
 from octostar.client import make_client
@@ -85,7 +84,6 @@ class NifiEntityModel(BaseModel):
         is_temporary: bool = False
         exception: dict = Field(default_factory=dict)
         last_processor_name: Optional[str] = None
-        fallback_os_workspace: Optional[str] = None
 
     class RecordModel(BaseModel):
         model_config = ConfigDict(extra="allow")
@@ -475,7 +473,6 @@ class NifiContextManager(object):
     def __init__(self, json_data, lazy_sync=True):
         if not json_data:
             raise ValueError("Nifi context manager received list of 0 entities")
-        self.permissions = {}
         self.in_batches = None
         self.out_entities = None
         self.nonlazy_sync_ids = set()
@@ -552,16 +549,6 @@ class NifiContextManager(object):
     def __enter__(self):
         return self
 
-    def get_workspaces_permissions(self, workspace_ids):
-        permissions_to_fetch = list(set(workspace_ids).difference(set(list(self.permissions.keys()))))
-        if permissions_to_fetch:
-            permissions = get_permissions.sync(permissions_to_fetch, client=self.client)
-            self.permissions.update(permissions)
-        permissions = {}
-        for k in workspace_ids:
-            permissions[k] = self.permissions.get(k, PermissionLevel.NONE)
-        return permissions
-
     def request_entity_sync(
         self,
         entity,
@@ -970,29 +957,7 @@ class NifiEntity(object):
 
     @property
     def write_os_workspace(self):
-        permissions = self.context.get_workspaces_permissions(
-            [
-                e
-                for e in [
-                    self.record.get("os_workspace"),
-                    self.request.get("fallback_os_workspace"),
-                ]
-                if e
-            ]
-        )
-        if (
-            self.record.get("os_workspace")
-            and (permissions.get(self.record.get("os_workspace")) or PermissionLevel.NONE) >= PermissionLevel.WRITE
-        ):
-            return self.record["os_workspace"]
-        elif (
-            self.request.get("fallback_os_workspace")
-            and (permissions.get(self.request.get("fallback_os_workspace")) or PermissionLevel.NONE)
-            >= PermissionLevel.WRITE
-        ):
-            return self.request["fallback_os_workspace"]
-        else:
-            return None
+        return self.record.get("os_workspace")
 
     @property
     def label(self):
@@ -1210,7 +1175,6 @@ class NifiEntity(object):
             "is_temporary": True,
             "exception": {},
             "last_processor_name": None,
-            "fallback_os_workspace": self.request["fallback_os_workspace"],
         }
         child_entity = NifiEntity(
             self.context,
@@ -1436,6 +1400,7 @@ class NifiEntity(object):
         os_entity_uid=None,
         os_relationship_uid=None,
         os_entity_type=FRAGMENT_ENTITY_NAME,
+        os_parent_uid=None,
         previous_fragment_uid=None,
         previous_fragment_relationship_uid=None,
         previous_fragment_relationship=PREVIOUS_FRAGMENT_RELATIONSHIP,
@@ -1448,7 +1413,7 @@ class NifiEntity(object):
         fields = {
             **{k: v for k, v in self.record.items() if k.startswith("fragment") and v is not None},
             **fields,
-            "os_parent_uid": self.record["os_entity_uid"],
+            "os_parent_uid": os_parent_uid or self.record["os_entity_uid"],
             "source_entity_uid": source_entity_uid,
             "previous_entity_uid": previous_fragment_uid,
             "next_entity_uid": next_fragment_uid,