lollms-client 0.14.0__py3-none-any.whl → 0.15.0__py3-none-any.whl

lollms_client/lollms_core.py

@@ -28,7 +28,8 @@ class LollmsClient():
     def __init__(self,
                  # LLM Binding Parameters
                  binding_name: str = "lollms",
-                 host_address: Optional[str] = None, # Shared host address default for all bindings if not specified
+                 host_address: Optional[str] = None, # Shared host address (for service based bindings) default for all bindings if not specified
+                 models_path: Optional[str] = None, # Shared models folder path (for local file based bindings) default for all bindings if not specified
                  model_name: str = "",
                  llm_bindings_dir: Path = Path(__file__).parent / "llm_bindings",
                  llm_binding_config: Optional[Dict[str, any]] = None, # Renamed for clarity
@@ -69,6 +70,7 @@ class LollmsClient():
         Args:
             binding_name (str): Name of the primary LLM binding (e.g., "lollms", "ollama").
             host_address (Optional[str]): Default host address for all services. Overridden by binding defaults if None.
+            models_path (Optional[str]): Default models folder path. Overridden by binding defaults if None.
             model_name (str): Default model name for the LLM binding.
             llm_bindings_dir (Path): Directory for LLM binding implementations.
             llm_binding_config (Optional[Dict]): Additional config for the LLM binding.
@@ -102,6 +104,7 @@ class LollmsClient():
             ValueError: If the primary LLM binding cannot be created.
         """
         self.host_address = host_address # Store initial preference
+        self.models_path = models_path
         self.service_key = service_key
         self.verify_ssl_certificate = verify_ssl_certificate
 
@@ -110,6 +113,7 @@ class LollmsClient():
         self.binding = self.binding_manager.create_binding(
             binding_name=binding_name,
             host_address=host_address, # Pass initial host preference
+            models_path=models_path,
             model_name=model_name,
             service_key=service_key,
             verify_ssl_certificate=verify_ssl_certificate,
@@ -123,8 +127,6 @@ class LollmsClient():
 
         # Determine the effective host address (use LLM binding's if initial was None)
         effective_host_address = self.host_address
-        if effective_host_address is None and self.binding:
-            effective_host_address = self.binding.host_address
 
         # --- Modality Binding Setup ---
         self.tts_binding_manager = LollmsTTSBindingManager(tts_bindings_dir)
@@ -440,14 +442,12 @@ class LollmsClient():
         Uses the underlying LLM binding via `generate_text`.
         """
         response_full = ""
-        full_prompt = f"""{self.system_full_header}Act as a code generation assistant that generates code from user prompt.
-{self.user_full_header}
-{prompt}
-"""
+        system_prompt = f"""Act as a code generation assistant that generates code from user prompt."""
+
         if template:
-            full_prompt += "Here is a template of the answer:\n"
+            system_prompt += "Here is a template of the answer:\n"
             if code_tag_format=="markdown":
-                full_prompt += f"""You must answer with the code placed inside the markdown code tag like this:
+                system_prompt += f"""You must answer with the code placed inside the markdown code tag like this:
 ```{language}
 {template}
 ```
@@ -456,7 +456,7 @@ The code tag is mandatory.
 Don't forget encapsulate the code inside a markdown code tag. This is mandatory.
 """
             elif code_tag_format=="html":
-                full_prompt +=f"""You must answer with the code placed inside the html code tag like this:
+                system_prompt +=f"""You must answer with the code placed inside the html code tag like this:
 <code language="{language}">
 {template}
 </code>
@@ -464,13 +464,13 @@ Don't forget encapsulate the code inside a markdown code tag. This is mandatory.
 The code tag is mandatory.
 Don't forget encapsulate the code inside a html code tag. This is mandatory.
 """
-        full_prompt += f"""Do not split the code in multiple tags.
-{self.ai_full_header}"""
+        system_prompt += f"""Do not split the code in multiple tags."""
 
         # Use generate_text which handles images internally
         response = self.generate_text(
-            full_prompt,
+            prompt,
             images=images,
+            system_prompt=system_prompt,
             n_predict=max_size,
             temperature=temperature,
             top_k=top_k,
@@ -509,14 +509,12 @@ Don't forget encapsulate the code inside a html code tag. This is mandatory.
         Handles potential continuation if the code block is incomplete.
         """
 
-        full_prompt = f"""{self.system_full_header}Act as a code generation assistant that generates code from user prompt.
-{self.user_full_header}
-{prompt}
-"""
+        system_prompt = f"""{self.system_full_header}Act as a code generation assistant that generates code from user prompt."""
+
         if template:
-            full_prompt += "Here is a template of the answer:\n"
+            system_prompt += "Here is a template of the answer:\n"
             if code_tag_format=="markdown":
-                full_prompt += f"""You must answer with the code placed inside the markdown code tag like this:
+                system_prompt += f"""You must answer with the code placed inside the markdown code tag like this:
 ```{language}
 {template}
 ```
@@ -525,7 +523,7 @@ The code tag is mandatory.
 Don't forget encapsulate the code inside a markdown code tag. This is mandatory.
 """
             elif code_tag_format=="html":
-                full_prompt +=f"""You must answer with the code placed inside the html code tag like this:
+                system_prompt +=f"""You must answer with the code placed inside the html code tag like this:
 <code language="{language}">
 {template}
 </code>
@@ -533,13 +531,14 @@ Don't forget encapsulate the code inside a markdown code tag. This is mandatory.
 The code tag is mandatory.
 Don't forget encapsulate the code inside a html code tag. This is mandatory.
 """
-        full_prompt += f"""You must return a single code tag.
+        system_prompt += f"""You must return a single code tag.
 Do not split the code in multiple tags.
 {self.ai_full_header}"""
 
         response = self.generate_text(
-            full_prompt,
+            prompt,
             images=images,
+            system_prompt=system_prompt,
             n_predict=max_size,
             temperature=temperature,
             top_k=top_k,

lollms_client/lollms_llm_binding.py

@@ -19,11 +19,7 @@ class LollmsLLMBinding(ABC):
         Initialize the LollmsLLMBinding base class.
 
         Args:
-            host_address (Optional[str]): The host address for the service. Defaults to None.
-            model_name (str): The name of the model to use. Defaults to empty string.
-            service_key (Optional[str]): Authentication key for the service. Defaults to None.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates. Defaults to True.
-            default_completion_format (ELF_COMPLETION_FORMAT): The completion format (Chat or Instruct)
+            binding_name (Optional[str]): The name of the bindingto be used
         """
         self.binding_name=binding_name
         self.model_name = None #Must be set by the instance

{lollms_client-0.14.0.dist-info → lollms_client-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lollms_client
-Version: 0.14.0
+Version: 0.15.0
 Summary: A client library for LoLLMs generate endpoint
 Author-email: ParisNeo <parisneoai@gmail.com>
 License: Apache Software License

{lollms_client-0.14.0.dist-info → lollms_client-0.15.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 examples/simple_text_gen_test.py,sha256=RoX9ZKJjGMujeep60wh5WT_GoBn0O9YKJY6WOy-ZmOc,8710
-examples/simple_text_gen_with_image_test.py,sha256=Euv53jbKTVJDvs854lgJvA5F-iRnAATLxAklig24ots,8534
+examples/simple_text_gen_with_image_test.py,sha256=V5dc6iLScpsVGDAd1xxbWMsdWqEZHbupyc6VaxH9S6o,9263
 examples/text_2_audio.py,sha256=MfL4AH_NNwl6m0I0ywl4BXRZJ0b9Y_9fRqDIe6O-Sbw,3523
 examples/text_2_image.py,sha256=Ri7lQ-GW54YWQh2eofcaN6LpwFoorbpJsJffrcXl3cg,6415
 examples/text_and_image_2_audio.py,sha256=QLvSsLff8VZZa7k7K1EFGlPpQWZy07zM4Fnli5btAl0,2074
-examples/text_gen.py,sha256=IejpNmIlsfz3WpJg8IRm5X6F06JKd7h_GuonUxTITx8,758
-examples/text_gen_system_prompt.py,sha256=wumwZ09WZkaK0tQ74KaZmfsYXcmjZIlsdim_P1aJmeA,910
+examples/text_gen.py,sha256=O3wuvsbEJMRSjIWBV828BXzIYtED-VgR85tXCqBBtZY,930
+examples/text_gen_system_prompt.py,sha256=jRQeGe1IVu_zRHX09CFiDYi7WrK9Zd5FlMqC_gnVH-g,1018
 examples/article_summary/article_summary.py,sha256=CR8mCBNcZEVCR-q34uOmrJyMlG-xk4HkMbsV-TOZEnk,1978
 examples/deep_analyze/deep_analyse.py,sha256=fZNmDrfEAuxEAfdbjAgJYIh1k6wbiuZ4RvwHRvtyUs8,971
 examples/deep_analyze/deep_analyze_multiple_files.py,sha256=fOryShA33P4IFxcxUDe-nJ2kW0v9w9yW8KsToS3ETl8,1032
@@ -13,13 +13,13 @@ examples/personality_test/chat_test.py,sha256=o2jlpoddFc-T592iqAiA29xk3x27KsdK5D
 examples/personality_test/chat_with_aristotle.py,sha256=4X_fwubMpd0Eq2rCReS2bgVlUoAqJprjkLXk2Jz6pXU,1774
 examples/personality_test/tesks_test.py,sha256=7LIiwrEbva9WWZOLi34fsmCBN__RZbPpxoUOKA_AtYk,1924
 examples/test_local_models/local_chat.py,sha256=slakja2zaHOEAUsn2tn_VmI4kLx6luLBrPqAeaNsix8,456
-lollms_client/__init__.py,sha256=PHFRY4RskAaiectooBrSCrxd6UGpZkdTqMHmXM26VnQ,823
+lollms_client/__init__.py,sha256=-V2JR_LrDutOtLId2GLedsNJ-9m01NLB7izv9sjXDXM,823
 lollms_client/lollms_config.py,sha256=goEseDwDxYJf3WkYJ4IrLXwg3Tfw73CXV2Avg45M_hE,21876
-lollms_client/lollms_core.py,sha256=KkeKjQZVeUjdsQjxw2bygUxq1gXlPNnYiyxdWnwA4L8,78073
+lollms_client/lollms_core.py,sha256=YJqvURx8nWQfnvorqGleR5qkNTlk_u-9mLeU07j4FjY,78296
 lollms_client/lollms_discussion.py,sha256=9b83m0D894jwpgssWYTQHbVxp1gJoI-J947Ui_dRXII,2073
 lollms_client/lollms_functions.py,sha256=p8SFtmEPqvVCsIz2fZ5HxyOHaxjrAo5c12uTzJnb6m8,3594
 lollms_client/lollms_js_analyzer.py,sha256=01zUvuO2F_lnUe_0NLxe1MF5aHE1hO8RZi48mNPv-aw,8361
-lollms_client/lollms_llm_binding.py,sha256=7xvtLsFQYqFKS7m0BQQMvVq0XXZWZeGlGuv30mi1dF8,7408
+lollms_client/lollms_llm_binding.py,sha256=sRtCUvXLdlGpaMzAYpqzDdwbCAHvwK5GFEqk3_-WxCU,7004
 lollms_client/lollms_python_analyzer.py,sha256=7gf1fdYgXCOkPUkBAPNmr6S-66hMH4_KonOMsADASxc,10246
 lollms_client/lollms_stt_binding.py,sha256=ovmpFF0fnmPC9VNi1-rxAJA8xI4JZDUBh_YwdtoTx28,5818
 lollms_client/lollms_tasks.py,sha256=Tgqces03gPTHFJCcPaeN9vBCsil3SSJX7nQAjCQ2-yg,34393
@@ -30,11 +30,14 @@ lollms_client/lollms_ttv_binding.py,sha256=u-gLIe22tbu4YsKA5RTyUT7iBlKxPXDmoQzcc
 lollms_client/lollms_types.py,sha256=cfc1sremM8KR4avkYX99fIVkkdRvXErrCWKGjLrgv50,2723
 lollms_client/lollms_utilities.py,sha256=YAgamfp0pBVApR68AHKjhp1lh6isMNF8iadwWLl63c0,7045
 lollms_client/llm_bindings/__init__.py,sha256=9sWGpmWSSj6KQ8H4lKGCjpLYwhnVdL_2N7gXCphPqh4,14
+lollms_client/llm_bindings/llamacpp/__init__.py,sha256=60QIeQBTx7iteeUe7bq6OM_xCIM3aVYPj3KJej9COJY,55076
 lollms_client/llm_bindings/lollms/__init__.py,sha256=a36AMPFEf3xK4zx1M_L9PC-3-b0iiDf7eyLkknPjgaY,12356
-lollms_client/llm_bindings/ollama/__init__.py,sha256=MemSA20Zivn-kfP11JPA9FHigC1U2CGsJ1FaDtUFUUM,26574
+lollms_client/llm_bindings/ollama/__init__.py,sha256=eHRwOcon61r1ISER-47M8zrZhRCKhuRFvHrnrLuY5Lw,26547
 lollms_client/llm_bindings/openai/__init__.py,sha256=NDZIdzW0pnHy9gPXSKfFyS6SPIOOxj9ZEzEE7gZT2NQ,12054
+lollms_client/llm_bindings/openllm/__init__.py,sha256=LDEwcT8CCsWrTs0ZyUg5OgP_1RV5HdCkDQmF2f5XSLo,29623
+lollms_client/llm_bindings/pythonllamacpp/__init__.py,sha256=xh2faZa57Nn6jscWhhu0WyRvhCC8kZ9cBJFKaE7Ddos,33332
 lollms_client/llm_bindings/tensor_rt/__init__.py,sha256=IY4CrHVpHY77R1rzsl3iwcoarDjYD24n7bFKk_69PD8,31983
-lollms_client/llm_bindings/transformers/__init__.py,sha256=IWfAmBGqZEelt5Z_jYTqpz7LzzKMVsKWx5nv4zBgKCQ,12544
+lollms_client/llm_bindings/transformers/__init__.py,sha256=gcpEQo-cs0Gzk-_gIB8fL_UjE2T_KJ1Y3FQLVA2mA94,36992
 lollms_client/llm_bindings/vllm/__init__.py,sha256=ZRCR7g3A2kHQ_07viNrNnVHoIGj5TNA4Q41rQWeTlxw,31967
 lollms_client/stt_bindings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lollms_client/stt_bindings/lollms/__init__.py,sha256=7-IZkrsn15Vaz0oqkqCxMeNQfMkeilbgScLlrrywES4,6098
@@ -46,8 +49,8 @@ lollms_client/tts_bindings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 lollms_client/tts_bindings/lollms/__init__.py,sha256=8x2_T9XscvISw2TiaLoFxvrS7TIsVLdqbwSc04cX-wc,7164
 lollms_client/ttv_bindings/__init__.py,sha256=UZ8o2izQOJLQgtZ1D1cXoNST7rzqW22rL2Vufc7ddRc,3141
 lollms_client/ttv_bindings/lollms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lollms_client-0.14.0.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-lollms_client-0.14.0.dist-info/METADATA,sha256=gkDoZr-SYxtqgyzp339qwmNj1_iBiFurvPVD6TTvc2Q,7276
-lollms_client-0.14.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-lollms_client-0.14.0.dist-info/top_level.txt,sha256=NI_W8S4OYZvJjb0QWMZMSIpOrYzpqwPGYaklhyWKH2w,23
-lollms_client-0.14.0.dist-info/RECORD,,
+lollms_client-0.15.0.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+lollms_client-0.15.0.dist-info/METADATA,sha256=b2b7eOzWqzfTHTeO87lZomNl_r6FOd5raiIhNXIUHMM,7276
+lollms_client-0.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lollms_client-0.15.0.dist-info/top_level.txt,sha256=NI_W8S4OYZvJjb0QWMZMSIpOrYzpqwPGYaklhyWKH2w,23
+lollms_client-0.15.0.dist-info/RECORD,,

{lollms_client-0.14.0.dist-info → lollms_client-0.15.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any