streamlit-octostar-utils 0.1.7a10__py3-none-any.whl → 0.2.0__py3-none-any.whl

streamlit_octostar_utils/api_crafter/parser/entities_parser.py

@@ -67,26 +67,16 @@ InvalidErrorDict = dict
 
 
 class EntitiesParser(object):
-    def __init__(self, parse_rulesets, client=None):
+    def __init__(self, parse_rulesets, ontology=None):
         self.concepts = dict()
         self.ruleset = dict()
-        self.ontology = None
-        self.os_client = client
+        self.ontology = ontology
         if not isinstance(parse_rulesets, list):
             parse_rulesets = [parse_rulesets]
         for parse_ruleset in parse_rulesets:
             self.ruleset = parse_ruleset.load(self.ruleset, self)
         self._reset_parsing_vars()
 
-    def _get_ontology(self):
-        if not self.ontology:
-            from octostar.utils.ontology import fetch_ontology_data
-
-            try:
-                self.ontology = fetch_ontology_data.sync(client=self.os_client)
-            except:
-                self.ontology = None
-
     def _reset_parsing_vars(self):
         self.curr_entries = list()
         self.curr_entities = list()
@@ -131,13 +121,13 @@ class EntitiesParser(object):
     def _cull_entities(self, entities, relationships):
         removed_ids = list()
         for entity in entities:
-            if "extra_fields" in entity.fields:
-                if not entity.fields["extra_fields"]:
-                    del entity.fields["extra_fields"]
+            if "#extra_fields" in entity.fields:
+                if not entity.fields["#extra_fields"]:
+                    del entity.fields["#extra_fields"]
                 else:
-                    for extra_field in list(entity.fields["extra_fields"].keys()):
-                        if not entity.fields["extra_fields"][extra_field]:
-                            del entity.fields["extra_fields"][extra_field]
+                    for extra_field in list(entity.fields["#extra_fields"].keys()):
+                        if not entity.fields["#extra_fields"][extra_field]:
+                            del entity.fields["#extra_fields"][extra_field]
             for field in list(entity.fields.keys()):
                 if not entity.fields[field]:
                     del entity.fields[field]
@@ -248,11 +238,11 @@ class EntitiesParser(object):
         if root_entity:
             root_entity = root_entity[0]
             unused_fields = dict()
-            if "extra_fields" not in root_entity.fields:
-                root_entity.fields["extra_fields"] = dict()
+            if "#extra_fields" not in root_entity.fields:
+                root_entity.fields["#extra_fields"] = dict()
             unused_fields = _find_extra_fields_recursive(entry.value)
-            root_entity.fields["extra_fields"] = {
-                **root_entity.fields["extra_fields"],
+            root_entity.fields["#extra_fields"] = {
+                **root_entity.fields["#extra_fields"],
                 **unused_fields,
             }
 
@@ -548,9 +538,8 @@ class EntitiesParser(object):
     """
 
     def validate_and_format_entities(self, entities, relationships):
-        self._get_ontology()
         if not self.ontology:
-            raise RuntimeError("Ontology could not be fetched for validation!")
+            raise RuntimeError("No ontology provided for validation!")
         ontology = self.ontology
         from streamlit_octostar_utils.ontology.validation import (
             validate_and_format_timbr_type,
@@ -571,7 +560,7 @@ class EntitiesParser(object):
             entity_properties = [
                 k
                 for k in entity.fields.keys()
-                if not k.startswith("#") and k != "extra_fields"
+                if not k.startswith("#")
             ]
             ontology_properties = {
                 e["property_name"]: e
@@ -665,32 +654,6 @@ class EntitiesParser(object):
             if relationship.concept_to == id_from:
                 relationship.concept_to = id_to
 
-    def extra_fields_to_entities(self, source_entities, remove_fields_from_source=True):
-        new_entities = list()
-        new_relationships = list()
-        for entity in source_entities:
-            if (
-                entity.fields
-                and "extra_fields" in entity.fields
-                and entity.fields["extra_fields"]
-            ):
-                new_entity = EntityInfo(
-                    self._compute_deterministic_uuid(
-                        entity.fields["extra_fields"], "json", False
-                    ),
-                    "json",
-                    entity.fields["extra_fields"],
-                )
-                if remove_fields_from_source:
-                    del entity.fields["extra_fields"]
-                new_entities.append(new_entity)
-                new_relationships.append(
-                    RelationshipInfo(
-                        entity.unique_id, new_entity.unique_id, "has_unparsed_data"
-                    )
-                )
-        return new_entities, new_relationships
-
     def to_linkchart(self, entities, relationships, label_fn):
         return_dict = {"records": list(), "relationships": list()}
         for entity in entities:

streamlit_octostar_utils/nlp/ner.py

@@ -163,7 +163,6 @@ def compute_ner(
         entities += flair_entities
         del flair_entities
 
-    print("Checking REGEXES")
     # REGEX model
     for label, regexes in REGEX_NER_MODELS.items():
         if not isinstance(regexes, list):
@@ -183,7 +182,6 @@ def compute_ner(
     min_score = min([min_score] + [e.score for e in regex_entities])
 
     # SPACY model
-    print("CHECKING SPACY")
     chunks = []
     chunk_start_offsets = []
     current_chunk = []

streamlit_octostar_utils/octostar/client.py

@@ -1,12 +1,10 @@
 from octostar.client import make_client, UserContext, User
 from functools import wraps
-from streamlit_octostar_research.desktop import whoami
+from octostar_streamlit.desktop import whoami
 from streamlit.runtime.scriptrunner import get_script_run_ctx
 import hashlib
 import streamlit as st
 import time
-import base64
-import json
 
 
 def impersonating_running_user(**client_kwargs):
@@ -27,14 +25,13 @@ def as_running_user(force_refresh=False):
     script_ctx = get_script_run_ctx()
     current_time = time.time()
 
-    def should_refresh():
-        return (
-            force_refresh
-            or id(script_ctx.script_requests) != session.get("prev_run_id")
-            or current_time > session.get("token_expiry", 0) - 300  # 5 minutes buffer
-        )
+    should_refresh = (
+        force_refresh
+        or script_ctx.script_requests is not session.get("prev_run")
+        or current_time > session.get("token_expiry", 0) - 300  # 5 minutes buffer
+    )
 
-    if not should_refresh() and "prev_user" in session:
+    if not should_refresh and "prev_user" in session:
         return UserContext(session["prev_user"])
 
     running_user = whoami()
@@ -52,5 +49,5 @@ def as_running_user(force_refresh=False):
         session["prev_user"] = user
         session["token_expiry"] = user.jwt_expires_at
 
-    session["prev_run_id"] = id(script_ctx.script_requests)
+    session["prev_run"] = script_ctx.script_requests
     return UserContext(session["prev_user"])

streamlit_octostar_utils/octostar/permissions.py

@@ -1,6 +1,6 @@
 import streamlit as st
 
-from streamlit_octostar_research.desktop import get_open_workspace_ids
+from octostar_streamlit.desktop import get_open_workspace_ids
 from octostar.utils.ontology import query_ontology
 from octostar.utils.workspace.permissions import get_permissions, PermissionLevel
 

{streamlit_octostar_utils-0.1.7a10.dist-info → streamlit_octostar_utils-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: streamlit-octostar-utils
-Version: 0.1.7a10
+Version: 0.2.0
 Summary: 
 License: MIT
 Author: Octostar
@@ -21,6 +21,7 @@ Requires-Dist: flair (==0.13.1) ; extra == "nlp"
 Requires-Dist: iso639 (>=0.1.0) ; extra == "nlp"
 Requires-Dist: nltk (>=3.8.0,<4.0.0) ; extra == "nlp"
 Requires-Dist: numpy (>=1.20.0)
+Requires-Dist: octostar-streamlit (>=0.1.25,<0.2.0)
 Requires-Dist: pottery (>=3.0.0,<4.0.0)
 Requires-Dist: py3langid (>=0.2.0,<0.3.0) ; extra == "nlp"
 Requires-Dist: pydantic (>=2.6.4,<3.0.0)
@@ -33,7 +34,6 @@ Requires-Dist: sortedcontainers (>=2.0.0)
 Requires-Dist: spacy (>=3.7.0,<4.0.0) ; extra == "nlp"
 Requires-Dist: spacy-download (==1.1.0) ; extra == "nlp"
 Requires-Dist: streamlit (>=1.33.0,<2.0.0)
-Requires-Dist: streamlit-octostar-research (>=0.1.22,<0.2.0)
 Requires-Dist: sumy (>=0.11.0,<1.0.0) ; extra == "nlp"
 Description-Content-Type: text/markdown
 

{streamlit_octostar_utils-0.1.7a10.dist-info → streamlit_octostar_utils-0.2.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ streamlit_octostar_utils/api_crafter/fastapi.py,sha256=2bktT5Mwjs9XixWcOqUKMoLM_
 streamlit_octostar_utils/api_crafter/nifi.py,sha256=fQ5k9eZl2oSQZ2BexZYwKUiO05-FryUi7wnCd_56P9Y,44375
 streamlit_octostar_utils/api_crafter/parser/__init__.py,sha256=YeYWF6sdQiCFV_RKNW2t9Vs6KJExE2pbXxWTe_DOayY,107
 streamlit_octostar_utils/api_crafter/parser/combine_fields.py,sha256=ddc44xkajw8MU0peAX_263DL7rPXbTKbHUjpOhRgvyU,8790
-streamlit_octostar_utils/api_crafter/parser/entities_parser.py,sha256=Z740IViQ8WX3xBzgWzsO6JHUps6GyNLJE8nlpt3KTzc,31418
+streamlit_octostar_utils/api_crafter/parser/entities_parser.py,sha256=zOQoN-p1Gz6ZzxvoX4M1b4Fi3mfmQr5zaNUcp_8gCjw,30016
 streamlit_octostar_utils/api_crafter/parser/generics.py,sha256=GefvTUWkqsICS_TdXA2p73_Uzh6041g88mWql3Fr9cY,1861
 streamlit_octostar_utils/api_crafter/parser/info.py,sha256=L2cdtsmfIdFSkAnIXhGhQZG6YMZRtY1GgLXn-847avA,649
 streamlit_octostar_utils/api_crafter/parser/linkchart_functions.py,sha256=WfHl-EfH4SWjpk8civS7HL11eIl4SAV5Dtwe8mTidrc,7163
@@ -19,14 +19,13 @@ streamlit_octostar_utils/core/filetypes.py,sha256=C4h4WDU8voMIdQETC3n1cd-CDgw9aN
 streamlit_octostar_utils/core/threading/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 streamlit_octostar_utils/core/threading/key_queue.py,sha256=7CJpj0gvZMQd8eC5wKQi3Ak5SQQ4zQ1OPTs_OP_kD20,2255
 streamlit_octostar_utils/core/timestamp.py,sha256=a3s4xfm1nctLzYsHOJxqoWIDTdbNY_yN1OByl8ahLc8,383
-streamlit_octostar_utils/hello.py,sha256=JVeug8fnyYYf_qw6eeMDBrdqsSkiwnSHdPvb9puEGdA,69
 streamlit_octostar_utils/nlp/__init__.py,sha256=BtlYDZK_xaEbc7Ju_7MznXbCVPZcdLn26xwR9qf_UhM,336
 streamlit_octostar_utils/nlp/language.py,sha256=13f6kAALYjC3EclBzcyKPd4GlIeIR1mWPu3S6d-z814,549
-streamlit_octostar_utils/nlp/ner.py,sha256=lw4VGJQHCJAudQvBJszJ0MYG-JGL-5-Y25wLY5ky6bU,13384
+streamlit_octostar_utils/nlp/ner.py,sha256=EAx4WNCH3jO9KQlK47hG3RMjnNpFadGl7CKfCQmSM7c,13326
 streamlit_octostar_utils/octostar/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-streamlit_octostar_utils/octostar/client.py,sha256=29tA1LY9ndLzAMR_KlL7Jb071YNAanubsppzy2BXb1E,1779
+streamlit_octostar_utils/octostar/client.py,sha256=2oyU3ZJp4a7GxFM3qH5UVzu2KQm2kSSjzFlqG6t6G2Q,1696
 streamlit_octostar_utils/octostar/context.py,sha256=TpucK48EbeVy4vDqKd9UULEtr1JOY-_4nBs-rXZzESw,212
-streamlit_octostar_utils/octostar/permissions.py,sha256=xa3yLuvFayjD1HH-9v8hYPrWOzBxK_WRr66Y4CKx-Kk,1574
+streamlit_octostar_utils/octostar/permissions.py,sha256=G5nZQLR-k-5_Xeto4nDTb32828Ga-SHm1mvSB9tz-t4,1565
 streamlit_octostar_utils/ontology/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 streamlit_octostar_utils/ontology/expand_entities.py,sha256=bBt32Dnts3VSzu13QQtPyfYe05IRodD9WfnhNTiBg_w,22749
 streamlit_octostar_utils/ontology/inheritance.py,sha256=oSd6xDAlmI7iYOv3VJ7t8CRN2zK7_Cln26YHS20qAqw,138
@@ -37,7 +36,7 @@ streamlit_octostar_utils/threading/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzp
 streamlit_octostar_utils/threading/async_task_manager.py,sha256=q7N6YZwUvIYMzkSHmsJNheNVCv93c03H6Hyg9uH8pvk,4747
 streamlit_octostar_utils/threading/session_callback_manager.py,sha256=LvZVP4g6tvKtYmI13f2j1sX_7hm61Groqp5xJine9_k,3973
 streamlit_octostar_utils/threading/session_state_hot_swapper.py,sha256=6eeCQI6A42hp4DmW2NQw2rbeR-k9N8DhfBKQdN_fbLU,811
-streamlit_octostar_utils-0.1.7a10.dist-info/LICENSE,sha256=dkwVPyV03fPHHtERnF6RnvRXcll__tud9gWca1RcgnQ,1073
-streamlit_octostar_utils-0.1.7a10.dist-info/METADATA,sha256=s86wH6OAhUfZBkiM2dIFUcw1x7g3COOUjBkWSYnmJGc,2268
-streamlit_octostar_utils-0.1.7a10.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-streamlit_octostar_utils-0.1.7a10.dist-info/RECORD,,
+streamlit_octostar_utils-0.2.0.dist-info/LICENSE,sha256=dkwVPyV03fPHHtERnF6RnvRXcll__tud9gWca1RcgnQ,1073
+streamlit_octostar_utils-0.2.0.dist-info/METADATA,sha256=CfGrV-aE4V02HSNDBHec34ngZR7tLSrAmCR0eyKKNRQ,2256
+streamlit_octostar_utils-0.2.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+streamlit_octostar_utils-0.2.0.dist-info/RECORD,,

{streamlit_octostar_utils-0.1.7a10.dist-info → streamlit_octostar_utils-0.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

streamlit_octostar_utils/hello.py

@@ -1,2 +0,0 @@
-def hello():
-    print("Hello world from streamlit-octostar-utils!")