streamlit-octostar-utils 0.1.7a11__tar.gz → 0.2.1__tar.gz

{streamlit_octostar_utils-0.1.7a11 → streamlit_octostar_utils-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: streamlit-octostar-utils
-Version: 0.1.7a11
+Version: 0.2.1
 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.7a11 → streamlit_octostar_utils-0.2.1}/pyproject.toml

@@ -5,7 +5,7 @@ include = '\.pyi?$'
 
 [tool.poetry]
 name = "streamlit-octostar-utils"
-version = "0.1.7a11"
+version = "0.2.1"
 description = ""
 license = "MIT"
 authors = ["Octostar"]
@@ -29,7 +29,7 @@ warn_unused_ignores = true
 python = ">=3.9,<3.9.7 || >3.9.7,<4.0"
 pydantic = "^2.6.4"
 streamlit = "^1.33.0"
-streamlit-octostar-research = "^0.1.22"
+octostar-streamlit = "^0.1.25"
 fastapi = ">=0.110.1, <1.0.0"
 python-multipart = "^0.0.9"
 sortedcontainers = ">=2.0.0"

{streamlit_octostar_utils-0.1.7a11 → streamlit_octostar_utils-0.2.1}/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-0.1.7a11 → streamlit_octostar_utils-0.2.1}/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()
@@ -45,12 +42,12 @@ def as_running_user(force_refresh=False):
             else st.stop()
         )
 
-    user_hash = int(hashlib.md5(running_user["os_jwt"].encode("utf-8")).hexdigest(), 16)
+    user_hash = int(hashlib.md5(running_user.os_jwt.encode("utf-8")).hexdigest(), 16)
     if "prev_user" not in session or hash(session["prev_user"]) != user_hash:
-        client = make_client(fixed_jwt=running_user["os_jwt"])
+        client = make_client(fixed_jwt=running_user.os_jwt)
         user = User(client)
         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-0.1.7a11 → streamlit_octostar_utils-0.2.1}/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.7a11/streamlit_octostar_utils/hello.py

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