unisi 0.3.15__py3-none-any.whl → 0.3.16__py3-none-any.whl

unisi/llmrag.py

@@ -90,7 +90,7 @@ def Q(str_prompt, type_value = str, blank = True, **format_model):
     if not re.search(r'json', str_prompt, re.IGNORECASE):           
         jtype = jstype(type_value)
         format = " dd/mm/yyyy string" if type_value == 'date' else f'a JSON {jtype}' if jtype != 'string' else jtype      
-        str_prompt = f"System: You are an intelligent and extremely smart assistant. Output STRONGLY {format}." + str_prompt 
+        str_prompt = f"System: You are an intelligent and extremely smart assistant. Output STRONGLY {format}. Do not output any commentary." + str_prompt 
     async def f():            
         io = await llm.ainvoke(str_prompt)
         js = io.content.strip().strip('`').replace('json', '')                      
@@ -107,9 +107,8 @@ def Q(str_prompt, type_value = str, blank = True, **format_model):
                     else:
                         if blank:
                             parsed[k] = None
-                            continue
-                        else:
-                            raise KeyError(f'Key {k} not found in {parsed}')
+                            continue                        
+                        raise KeyError(f'Key {k} not found in {parsed}')
                         
                 if not is_type(parsed[k], v):
                     raise TypeError(f'Invalid type for {k}: {type(parsed[k])} != {v}')

unisi/server.py

@@ -9,7 +9,12 @@ from .llmrag import setup_llmrag
 from .dbunits import dbupdates
 from .kdb import Database
 from config import port, upload_dir
-import traceback, json
+import traceback, json, random, string
+from urllib.parse import parse_qs
+
+def generate_random_string(length=10):
+    characters = string.ascii_letters + string.digits 
+    return ''.join(random.choices(characters, k=length))
 
 def context_user():
     return context_object(User)
@@ -34,11 +39,17 @@ if config.db_dir:
     Unishare.db = Database(config.db_dir, message_logger) 
 
 def make_user(request):
-    session = f'{request.remote}-{User.count}'        
-    if requested_connect := request.query_string if config.share else None:
-        user = Unishare.sessions.get(requested_connect, None)
+    parsed_query = parse_qs(request.query_string)
+    if 'session' in parsed_query:
+        session = parsed_query['session'][0]
+        user_id = session.split('-')[1]
+    else:
+        user_id = parsed_query.get('id', [User.count])[0]
+        session = f'{generate_random_string()}-{user_id}'        
+    if config.share and 'session' in parsed_query:
+        user = Unishare.sessions.get(session, None)
         if not user:
-            error = f'Session id "{requested_connect}" is unknown. Connection refused!'
+            error = f'Session id "{session}" is unknown. Connection refused!'
             with logging_lock:
                 logging.error(error)
             return None, Error(error)
@@ -106,7 +117,7 @@ async def static_serve(request):
      
 async def websocket_handler(request):
     ws = web.WebSocketResponse()
-    await ws.prepare(request)
+    await ws.prepare(request)    
     user, status = make_user(request)
     if not user:
         await ws.send_str(toJson(status))

{unisi-0.3.15.dist-info → unisi-0.3.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unisi
-Version: 0.3.15
+Version: 0.3.16
 Summary: Unified System Interface, GUI and Remote API
 Author-Email: UNISI Tech <g.dernovoy@gmail.com>
 License: Apache-2.0

{unisi-0.3.15.dist-info → unisi-0.3.16.dist-info}/RECORD

@@ -1,7 +1,7 @@
-unisi-0.3.15.dist-info/METADATA,sha256=r-Ax_zHww1_W5413mkStd6mb-9dBiG-_Pnzf9fcxkNI,27266
-unisi-0.3.15.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-unisi-0.3.15.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.3.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi-0.3.16.dist-info/METADATA,sha256=o3bi9eL509XYvMrr-juU0QEGBeRAAp3X_ST4itU5Ulk,27266
+unisi-0.3.16.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+unisi-0.3.16.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+unisi-0.3.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 unisi/__init__.py,sha256=prG4FwJzpNJRX1trto0x_4Bne3kkpEX1dUxcRnIxWVw,301
 unisi/autotest.py,sha256=qYKwSPEPUEio6koUSu1tc71pDkX-doCQJlyRppaXCtY,8709
 unisi/common.py,sha256=bMPZo7V9nlJW5HC0yJLRDbrh0DZ4oqmEtBuOvGyN6fw,5759
@@ -14,11 +14,11 @@ unisi/jsoncomparison/config.py,sha256=LbdLJE1KIebFq_tX7zcERhPvopKhnzcTqMCnS3jN12
 unisi/jsoncomparison/errors.py,sha256=wqphE1Xn7K6n16uvUhDC45m2BxbsMUhIF2olPbhqf4o,1192
 unisi/jsoncomparison/ignore.py,sha256=xfF0a_BBEyGdZBoq-ovpCpawgcX8SRwwp7IrGnu1c2w,2634
 unisi/kdb.py,sha256=K-Lqc3e9hLTwO0i1ilTC6qrwZp90tXjLm7HFb_lM1Os,13621
-unisi/llmrag.py,sha256=M5BvP8MbVjJhnhrnoyP-PfN0OnFYXBzgSGtd52W56tM,7057
+unisi/llmrag.py,sha256=xlye9OodtIZaoMWEV8hfF_Vjo4VtXVYxY3qiY3qaD74,7077
 unisi/multimon.py,sha256=YKwCuvMsMfdgOGkJoqiqh_9wywXMeo9bUhHmbAIUeSE,4060
 unisi/proxy.py,sha256=QMHSSFJtmVZIexIMAsuFNlF5JpnYNG90rkTM3PYJhY4,7750
 unisi/reloader.py,sha256=qml-ufoUME7mrWrPMwMo3T8Jsh4e26CBj564cHCB6I0,6749
-unisi/server.py,sha256=xoUSn4lNv0o3Jn68wE4hL4UcfEBo_jVBvKxUfu1bIGU,6185
+unisi/server.py,sha256=9qgSH-HjQDQwSK2gor_dUGqHocrJS-Z-t5B54EjUDd0,6594
 unisi/tables.py,sha256=tszF62VToSchILzPhJgA4U02MFjv44LopXgD5mYg7fg,13822
 unisi/units.py,sha256=SCUZAOV0nu9khg6JE0lWwsKjiCVz29hiUCRXyZJffeA,11111
 unisi/users.py,sha256=JeIori4XsW1blkasLwqZeK8XloX7UjDV_0aHE7WNWjo,16169
@@ -46,4 +46,4 @@ unisi/web/js/885.d3e9dd2b.js,sha256=7A39S4SDApVc4iHHABjOd5julybSa4UwaH4kj8vSn0E,
 unisi/web/js/935.cc0c012c.js,sha256=FzVIRBr4vyQgW38ROCoh929gtzuXqM73Cf77vejfDWk,6561
 unisi/web/js/app.3d5227f7.js,sha256=lJkD2OPQOYlxivZmNY8FYKI1JMQ_bh1Pm4zC7y8Ayt0,6150
 unisi/web/js/vendor.1bb14e9d.js,sha256=7q80jaZcms7UhWSqHAk2pXSx67cYQJGlsp-6DBXBZuU,1253597
-unisi-0.3.15.dist-info/RECORD,,
+unisi-0.3.16.dist-info/RECORD,,