streamlit-octostar-utils 0.1.7a11__py3-none-any.whl → 0.2.1__py3-none-any.whl

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()
@@ -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/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.dist-info → streamlit_octostar_utils-0.2.1.dist-info}/METADATA

@@ -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.dist-info → streamlit_octostar_utils-0.2.1.dist-info}/RECORD

@@ -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=NUvHe9asd65g4-hJ4CuUvUns-9dNWes1XZRJlO9eAAc,1690
 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.7a11.dist-info/LICENSE,sha256=dkwVPyV03fPHHtERnF6RnvRXcll__tud9gWca1RcgnQ,1073
-streamlit_octostar_utils-0.1.7a11.dist-info/METADATA,sha256=sh4TvXiQ_9cxohuhsa_MuY8kcqGJZ2GnVBNCVRXpbpc,2268
-streamlit_octostar_utils-0.1.7a11.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-streamlit_octostar_utils-0.1.7a11.dist-info/RECORD,,
+streamlit_octostar_utils-0.2.1.dist-info/LICENSE,sha256=dkwVPyV03fPHHtERnF6RnvRXcll__tud9gWca1RcgnQ,1073
+streamlit_octostar_utils-0.2.1.dist-info/METADATA,sha256=v16q0aIPofBZnQjs0jwkTtAeN2jHiTc2HJ_LjK_NQRo,2256
+streamlit_octostar_utils-0.2.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+streamlit_octostar_utils-0.2.1.dist-info/RECORD,,

{streamlit_octostar_utils-0.1.7a11.dist-info → streamlit_octostar_utils-0.2.1.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!")