streamlit-octostar-utils 0.2.3a2__tar.gz → 0.2.5__tar.gz

{streamlit_octostar_utils-0.2.3a2 → streamlit_octostar_utils-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: streamlit-octostar-utils
-Version: 0.2.3a2
+Version: 0.2.5
 Summary: 
 License: MIT
 Author: Octostar

{streamlit_octostar_utils-0.2.3a2 → streamlit_octostar_utils-0.2.5}/pyproject.toml

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

{streamlit_octostar_utils-0.2.3a2 → streamlit_octostar_utils-0.2.5}/streamlit_octostar_utils/api_crafter/nifi.py

@@ -13,9 +13,6 @@ from typing import Dict, Any
 from fastapi import Request
 from fastapi.responses import JSONResponse
 from starlette.exceptions import HTTPException as StarletteHTTPException
-import logging
-
-logger = logging.getLogger(__name__)
 
 from octostar.utils.workspace import read_file, upsert_entities, write_file
 from octostar.utils.ontology import fetch_ontology_data
@@ -407,9 +404,7 @@ class NifiContextManager(object):
             {e.record["entity_id"]: e for e in all_entities}.values()
         )
         self.sync_entities()
-        output = [entity for entity in self.jsonify(self.out_entities)["content"]]
-        raise Exception(output)
-        return output
+        return [entity for entity in self.jsonify(self.out_entities)["content"]]
 
     def raise_exception(self, entity, exc):
         error_response = DefaultErrorRoute.format_error(exc)
@@ -638,7 +633,6 @@ class NifiEntity(object):
     ):
         self.context = context
         self.request = request
-        self.request["nifi_attributes"] = {}
         self.record = record
         self.annotations = annotations
         assert self.record.get("os_entity_uid") and self.record.get("entity_id")

streamlit_octostar_utils-0.2.5/streamlit_octostar_utils/core/filetypes.py

@@ -0,0 +1,31 @@
+import mimetypes
+import filetype
+
+
+def add_filetypes():
+    mimetypes.add_type("text/csv", ".csv")
+
+
+def recognize_filetype(file=None, filename=None):
+    if not (file or filename):
+        raise ValueError("Must provide either file content or filename")
+    from_name_guess = None
+    from_file_guess = None
+    if filename:
+        from_name_guess, _ = mimetypes.guess_type(filename)
+    if file:
+        ft = filetype.guess(file)
+        from_file_guess = ft.mime if ft else None
+    def _family(m):
+        return m.split("/", 1)[0] if isinstance(m, str) and "/" in m else None
+    def _subtype(m):
+        return m.split("/", 1)[-1] if isinstance(m, str) and "/" in m else None
+    if not from_file_guess and not from_name_guess:
+        return "unknown"
+    if not (from_file_guess and from_name_guess):
+        return from_file_guess or from_name_guess
+    if _family(from_file_guess) != _family(from_name_guess):
+        return from_file_guess
+    if _subtype(from_file_guess) != _subtype(from_name_guess):
+        return from_name_guess
+    return from_name_guess

streamlit_octostar_utils-0.2.3a2/streamlit_octostar_utils/core/filetypes.py

@@ -1,25 +0,0 @@
-import mimetypes
-import filetype
-
-
-def add_filetypes():
-    mimetypes.add_type("text/csv", ".csv")
-
-
-def recognize_filetype(file, filename):
-    from_name_guess, _ = mimetypes.guess_type(filename)
-    from_file_guess = filetype.guess(file)
-    if from_file_guess:
-        from_file_guess = from_file_guess.mime
-    recognized_filetype = None
-    if not from_file_guess and not from_name_guess:
-        recognized_filetype = "unknown"
-    elif not (from_file_guess and from_name_guess):
-        recognized_filetype = from_file_guess or from_name_guess
-    elif from_file_guess.split("/", 1)[0] != from_name_guess.split("/", 1)[0]:
-        recognized_filetype = from_file_guess
-    elif from_file_guess.split("/", 1)[-1] != from_name_guess.split("/", 1)[-1]:
-        recognized_filetype = from_name_guess
-    else:
-        recognized_filetype = from_name_guess
-    return recognized_filetype