unisi 0.3.22__py3-none-any.whl → 0.3.23__py3-none-any.whl

unisi/llmrag.py

@@ -138,7 +138,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}. DO NOT OUTPUT ANY COMMENTARY." + str_prompt 
+        str_prompt = f"System: You are an intelligent and extremely smart assistant. Output STRONGLY in format {format}. DO NOT OUTPUT ANY COMMENTARY." + str_prompt 
     async def f():            
         if Unishare.llm_cache:            
             if content := Unishare.llm_cache.get(str_prompt):
@@ -183,9 +183,12 @@ def setup_llmrag():
     import config #the module is loaded before config analysis    
     temperature = getattr(config, 'temperature', 0.0)
     if config.llm:
+        api_key_config = None
+        model = None
         match config.llm:
-            case ['host', address]: 
-                model = None
+            case ['host', address]:                 
+                type = 'host' #provider type is openai for local llms
+            case ['host', address, api_key_config, model]:                 
                 type = 'host' #provider type is openai for local llms
             case [type, model, address]: ...
             case [type, model]: address = None
@@ -195,11 +198,14 @@ def setup_llmrag():
                 
         type = type.lower()
         match type:
-            case 'host':            
+            case 'host':  
+                api_key_from_config = os.environ.get(api_key_config) if api_key_config else None
+                api_key = api_key_from_config if api_key_from_config else 'llm-studio'                         
                 Unishare.llm_model = ChatOpenAI(
-                    api_key = 'llm-studio',
+                    api_key = api_key,
                     temperature = temperature,
-                    openai_api_base = address
+                    openai_api_base = address,
+                    model = model
                 ) 
             case 'openai':
                 Unishare.llm_model = ChatOpenAI(temperature = temperature)
@@ -238,7 +244,7 @@ async def get_property(name, context = '', type = str, options = None):
     if type == str and re.search(r'date', name, re.IGNORECASE):
         type = 'date'
     limits = f', which possible options are {",".join(opt for opt in options)},' if options else ''                    
-    prompt = """Context: {context} . Output ONLY "{name}" explicit value{limits} based on the context. """    
+    prompt = """Output ONLY explicit value{limits} based on the context. Example: Context: Animal: Byrd. Query: Has beak: True. Context: {context}. Query: {name}:"""    
     try:
         value = await Q(prompt, type)
     except Exception as e:        

unisi/units.py

@@ -139,6 +139,11 @@ class Unit:
         """reduce for external (llm) using if required"""
         return f'{self.name} : {self.value}'
     
+    @property
+    def type_value(self):
+        """return python system type if value not 'date' type"""
+        return type(self.value) if self.type != 'date' else 'date'
+    
     async def emit(self, *_ ):        
         """calcute value by system llm, can be used as a handler"""
         if Unishare.llm_model and (exactly := getattr(self, 'llm', None)) is not None:        
@@ -146,7 +151,7 @@ class Unit:
             #exactly is requirment that all elements have to have valid value
             if not exactly or len(elems) == len(self._llm_dependencies):
                 context = ','.join(elems)    
-                self.value = await get_property(self.name, context, self.type, options = getattr(self, 'options', None))
+                self.value = await get_property(self.name, context, self.type_value, options = getattr(self, 'options', None))
                 return self
             
     def add_changed_handler(self, handler):

{unisi-0.3.22.dist-info → unisi-0.3.23.dist-info}/METADATA

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

{unisi-0.3.22.dist-info → unisi-0.3.23.dist-info}/RECORD

@@ -1,7 +1,7 @@
-unisi-0.3.22.dist-info/METADATA,sha256=kCucMp5tiBVVORmTkqdhLJ3dV4M-GwVVav9D1zUmx7o,27266
-unisi-0.3.22.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-unisi-0.3.22.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-unisi-0.3.22.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+unisi-0.3.23.dist-info/METADATA,sha256=Ep_TT9GSF_oRgXAGi_DClaKG-fVaroxN9dP0QglK3pE,27266
+unisi-0.3.23.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+unisi-0.3.23.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+unisi-0.3.23.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 unisi/__init__.py,sha256=prG4FwJzpNJRX1trto0x_4Bne3kkpEX1dUxcRnIxWVw,301
 unisi/autotest.py,sha256=DFhGPbXwNjN0dZByLTns0voBEsKccU1DfetfEIhmK6U,8753
 unisi/common.py,sha256=QHSS-pQDtLZxeZls0eDl8-EmYJZuaRmYO1M9izCly-Y,5791
@@ -14,13 +14,13 @@ 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=Ra462DhayMtcFg-QnF8HdZQGQL3mplzUu7Y9WZTjssM,9413
+unisi/llmrag.py,sha256=nSU1IHrsZG4h7kQCbBk8LOg828HeA1jHJs8FtNJMVZs,9895
 unisi/multimon.py,sha256=YKwCuvMsMfdgOGkJoqiqh_9wywXMeo9bUhHmbAIUeSE,4060
 unisi/proxy.py,sha256=QMHSSFJtmVZIexIMAsuFNlF5JpnYNG90rkTM3PYJhY4,7750
 unisi/reloader.py,sha256=t7z0NgaeJX52044ue_LxITa99WMuE5Jra9qkMEeGhTg,6941
 unisi/server.py,sha256=owUV_siimohV-PZwMkkIRTnynY0wxpia2la3Vjqy9g8,6658
 unisi/tables.py,sha256=IBuN9f4AF0SkN9uRPf2WWwdXgAzDnj46y0_C09iC2h4,13809
-unisi/units.py,sha256=egOpf1I6ckAtBR9Lj2ot-RVyecIVmmuc5Rkwffl3y6A,11159
+unisi/units.py,sha256=p-3Mg1piS6ZITWEvJylZygWTDqUqInZtjjVq0Cj32ko,11342
 unisi/users.py,sha256=H5_3n9C-Uhxs_bEPh6_UpfWp7GOh3D9Jhkl2yBbkWqM,16365
 unisi/utils.py,sha256=yNhDKCTjHL1H2Suk9DRQkXAZKYy6nqub-dNSdwPwl9I,2625
 unisi/voicecom.py,sha256=QzS1gIrBeGLO5dEwiu7KIEdJIIVbPBZFGb5nY632Ws8,16707
@@ -55,4 +55,4 @@ unisi/web/js/sigma.ce21336a.js,sha256=ngST-065XWOdnR_Xn7U6oGNHTL8fyiOEI9V8-BWRvl
 unisi/web/js/sigma.ce21336a.js.gz,sha256=zv6oToZZFCfmrZ4G4fw0sOncVe8-dyYNWh2v5QLKZp4,51965
 unisi/web/js/vendor.6a64dcc5.js,sha256=OSNK2nadU2DnSOEYQQcAmelybITOFZXMxnRyaDoT3yU,747104
 unisi/web/js/vendor.6a64dcc5.js.gz,sha256=nmtqRzQRWaToxgHxI9hfJd3UrUCg2-fd-0Fjc4H4wu8,245827
-unisi-0.3.22.dist-info/RECORD,,
+unisi-0.3.23.dist-info/RECORD,,