ai-microcore 3.16.4__tar.gz → 4.0.0.dev1__tar.gz

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-microcore
-Version: 3.16.4
+Version: 4.0.0.dev1
 Summary: # Minimalistic Foundation for AI Applications
 Keywords: llm,large language models,ai,similarity search,ai search,gpt,openai
 Author-email: Vitalii Stepanenko <mail@vitalii.in>

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/microcore/__init__.py

@@ -161,4 +161,4 @@ __all__ = [
     # "wrappers",
 ]
 
-__version__ = "3.16.4"
+__version__ = "4.0.0-dev1"

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/microcore/_prepare_llm_args.py

@@ -22,7 +22,7 @@ def prepare_chat_messages(prompt: TPrompt) -> list[dict]:
             dict(role=DEFAULT_MESSAGE_ROLE, content=msg)
             if isinstance(msg, str)
             else (
-                asdict(msg, dict_factory=msg.dict_factory)
+                asdict(msg, dict_factory=msg.DICT_FACTORY)
                 if isinstance(msg, Msg)
                 else msg
             )

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/microcore/ai_func/__init__.py

@@ -5,13 +5,23 @@ descr: Allows to describe python functions for LLM
 
 import ast
 import inspect
+from enum import Enum
 from typing import Dict, Any
 import docstring_parser
 from .. import tpl
+from ..utils import dedent
 
 
+class AiFuncSyntax(str, Enum):
+    PYTHONIC: str = "pythonic"
+    JSON: str = "json"
+    DEFAULT: str = str(JSON)
+
+    def __str__(self):
+        return self.value
+
 def func_arg_comments(func):
-    func_source = inspect.getsource(func)
+    func_source = dedent(inspect.getsource(func))
     module = ast.parse(func_source)
     func_def = module.body[0]
 
@@ -60,7 +70,7 @@ def func_metadata(func) -> Dict[str, Any]:
     for name, val in metadata["args"].items():
         val["comment"] = arg_comments[name]
 
-        # Parse docstring
+    # Parse docstring
     parsed_docstring = docstring_parser.parse(inspect.getdoc(func))
 
     # Add descriptions from parsed docstring to parameters
@@ -71,6 +81,17 @@ def func_metadata(func) -> Dict[str, Any]:
     return metadata
 
 
-def describe_ai_func(func):
+def describe_ai_func(func: callable, syntax: AiFuncSyntax | str = None) -> str:
+    """
+    Renders function description for LLM
+    Args:
+        func: callable: function to describe
+        syntax: AiFuncSyntax | str: syntax to use for the description
+                - Use AiFuncSyntax enums to use standard templates (""json", "pythonic")
+                - Use custom template name to use custom template
+    Returns: str: rendered description, part of prompt
+    """
+    syntax = syntax or AiFuncSyntax.DEFAULT
+    tpl_file = f"ai-func.{syntax}.j2" if syntax in AiFuncSyntax else syntax
     metadata = func_metadata(func)
-    return tpl("python_ai_func.j2", **metadata)
+    return tpl(tpl_file, **metadata)

ai_microcore-4.0.0.dev1/microcore/ai_func/ai-func.json.j2

@@ -0,0 +1,11 @@
+# {{ description or name.replace('_', ' ').capitalize() }}
+{
+  "call": "{{ name }}"{% if args %}{{ "," }}{% endif %}
+{%- for k,v in args.items() %}
+  "{{ k }}":
+    {%- if v.type %} <{{ v.type }}>{% endif -%}
+    {%- if v.default != 'NOT_SET' %} (default = {{ v.default }}){%endif-%}
+    {%- if not loop.last -%},{%- endif -%}
+    {%- if v.comment %} {{ v.comment }}{% endif -%}
+{%- endfor -%}
+{{ "\n}" }}

ai_microcore-3.16.4/microcore/ai_func/python_ai_func.j2 → ai_microcore-4.0.0.dev1/microcore/ai_func/ai-func.pythonic.j2

@@ -1,4 +1,4 @@
-# {{ description }}
+# {{ description or name.replace('_', ' ').capitalize() }}
 {{ name }}(
 {%- for name,v in args.items() -%}
 {{ "\n\t" }}{{ name }}

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/microcore/configuration.py

@@ -369,6 +369,10 @@ class Config(LLMConfig):
 
     EMBEDDING_DB_ALLOW_DUPLICATES: bool = from_env(dtype=bool, default=False)
 
+    EMBEDDING_DB_HOST: str = from_env(default=None)
+
+    EMBEDDING_DB_PORT: str = from_env(default=None)
+
     DEFAULT_ENCODING: str = from_env("utf-8")
     """Used in file system operations, utf-8 by default"""
 

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/microcore/embedding_db/__init__.py

@@ -1,5 +1,4 @@
 import logging
-import sys
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 
@@ -8,6 +7,8 @@ import tiktoken
 from ..utils import ExtendedString
 
 
+INT32_MAX = 2**31 - 1  # 2147483647
+
 class SearchResults(list):
     def fit_to_token_size(
         self,
@@ -115,7 +116,7 @@ class AbstractEmbeddingDB(ABC):
         **kwargs,
     ) -> SearchResults | list[str | SearchResult]:
         return self.search(
-            collection, query, n_results=sys.maxsize - 1, where=where, **kwargs
+            collection, query, n_results=INT32_MAX, where=where, **kwargs
         )
 
     @abstractmethod

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/microcore/embedding_db/chromadb.py

@@ -5,7 +5,6 @@ import chromadb
 from chromadb.config import Settings
 from chromadb.errors import ChromaError
 from chromadb.utils import embedding_functions
-from chromadb.errors import InvalidCollectionException
 from ..configuration import Config
 from .. import SearchResult, SearchResults, AbstractEmbeddingDB
 
@@ -17,10 +16,17 @@ class ChromaEmbeddingDB(AbstractEmbeddingDB):
     client: chromadb.Client = None
 
     def __post_init__(self):
-        self.client = chromadb.PersistentClient(
-            path=f"{self.config.STORAGE_PATH}/{self.config.EMBEDDING_DB_FOLDER}",
-            settings=Settings(anonymized_telemetry=False),
-        )
+        if self.config.EMBEDDING_DB_HOST:
+            self.client = chromadb.HttpClient(
+                host=self.config.EMBEDDING_DB_HOST,
+                port=self.config.EMBEDDING_DB_PORT or 8000,
+                settings=Settings(anonymized_telemetry=False),
+            )
+        else:
+            self.client = chromadb.PersistentClient(
+                path=f"{self.config.STORAGE_PATH}/{self.config.EMBEDDING_DB_FOLDER}",
+                settings=Settings(anonymized_telemetry=False),
+            )
         self.embedding_function = (
             self.config.EMBEDDING_DB_FUNCTION
             or embedding_functions.DefaultEmbeddingFunction()
@@ -170,5 +176,5 @@ class ChromaEmbeddingDB(AbstractEmbeddingDB):
             return self.client.get_collection(
                 name, embedding_function=self.embedding_function
             )
-        except (ValueError, InvalidCollectionException):
+        except (ValueError, ChromaError):
             return None

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/microcore/llm/shared.py

@@ -21,4 +21,5 @@ def prepare_callbacks(config: Config, args, set_stream: bool = True) -> list[cal
             callbacks.append(cb)
     if set_stream and "stream" not in args:
         args["stream"] = bool(callbacks)
-    return callbacks
+
+    return callbacks

{ai_microcore-3.16.4 → ai_microcore-4.0.0.dev1}/microcore/message_types.py

@@ -2,6 +2,7 @@
 
 from enum import Enum
 from dataclasses import dataclass, field
+from typing import ClassVar
 
 
 class Role(str, Enum):
@@ -9,16 +10,20 @@ class Role(str, Enum):
     USER = "user"
     ASSISTANT = "assistant"
 
+    def __str__(self):
+        return self.value
+
 
 DEFAULT_MESSAGE_ROLE = Role.USER
 
 
 @dataclass
 class Msg:
-    dict_factory = dict
     role: str = field(default=DEFAULT_MESSAGE_ROLE)
     content: str = field(default="")
 
+    DICT_FACTORY: ClassVar = dict
+
     def __str__(self):
         return str(self.content)
 
@@ -49,10 +54,11 @@ class PartialMsg(AssistantMsg):
         is_partial = True
         """Custom dictionary class to handle additional properties"""
 
-    dict_factory = _PartialMsgDict
     placeholder = "<|placeholder|>"
     variants_splitter = "<|or|>"
 
+    DICT_FACTORY: ClassVar = _PartialMsgDict
+
     @staticmethod
     def split_prefix_and_suffixes(content: str):
         parts = content.split(PartialMsg.placeholder)