langroid 0.26.2__tar.gz → 0.27.1__tar.gz

{langroid-0.26.2 → langroid-0.27.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.26.2
+Version: 0.27.1
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani

{langroid-0.26.2 → langroid-0.27.1}/langroid/agent/base.py

@@ -450,20 +450,20 @@ class Agent(ABC):
         """
         if results is None:
             return None
+        if isinstance(results, str):
+            results_str = results
+        elif isinstance(results, ChatDocument):
+            results_str = results.content
+        elif isinstance(results, dict):
+            results_str = json.dumps(results, indent=2)
         if not settings.quiet:
-            if isinstance(results, str):
-                results_str = results
-            elif isinstance(results, ChatDocument):
-                results_str = results.content
-            elif isinstance(results, dict):
-                results_str = json.dumps(results, indent=2)
             console.print(f"[red]{self.indent}", end="")
             print(f"[red]Agent: {escape(results_str)}")
-            maybe_json = len(extract_top_level_json(results_str)) > 0
-            self.callbacks.show_agent_response(
-                content=results_str,
-                language="json" if maybe_json else "text",
-            )
+        maybe_json = len(extract_top_level_json(results_str)) > 0
+        self.callbacks.show_agent_response(
+            content=results_str,
+            language="json" if maybe_json else "text",
+        )
         if isinstance(results, ChatDocument):
             # Preserve trail of tool_ids for OpenAI Assistant fn-calls
             results.metadata.tool_ids = (

{langroid-0.26.2 → langroid-0.27.1}/langroid/agent/chat_agent.py

@@ -1734,25 +1734,30 @@ class ChatAgent(Agent):
             # streaming was enabled, AND we did not find a cached response.
             # If we are here, it means the response has not yet been displayed.
             cached = f"[red]{self.indent}(cached)[/red]" if is_cached else ""
+            chat_doc = (
+                response
+                if isinstance(response, ChatDocument)
+                else ChatDocument.from_LLMResponse(response, displayed=True)
+            )
+            # TODO: prepend TOOL: or OAI-TOOL: if it's a tool-call
             if not settings.quiet:
-                chat_doc = (
-                    response
-                    if isinstance(response, ChatDocument)
-                    else ChatDocument.from_LLMResponse(response, displayed=True)
-                )
-                # TODO: prepend TOOL: or OAI-TOOL: if it's a tool-call
                 print(cached + "[green]" + escape(str(response)))
-                self.callbacks.show_llm_response(
-                    content=str(response),
-                    is_tool=self.has_tool_message_attempt(chat_doc),
-                    cached=is_cached,
-                )
+            self.callbacks.show_llm_response(
+                content=str(response),
+                is_tool=self.has_tool_message_attempt(chat_doc),
+                cached=is_cached,
+            )
         if isinstance(response, LLMResponse):
             # we are in the context immediately after an LLM responded,
             # we won't have citations yet, so we're done
             return
-        if response.metadata.has_citation and not settings.quiet:
-            print("[grey37]SOURCES:\n" + escape(response.metadata.source) + "[/grey37]")
+        if response.metadata.has_citation:
+            if not settings.quiet:
+                print(
+                    "[grey37]SOURCES:\n"
+                    + escape(response.metadata.source)
+                    + "[/grey37]"
+                )
             self.callbacks.show_llm_response(
                 content=str(response.metadata.source),
                 is_tool=False,

{langroid-0.26.2 → langroid-0.27.1}/langroid/agent/task.py

@@ -571,7 +571,7 @@ class Task:
 
         if self.caller is not None and self.caller.logger is not None:
             self.logger = self.caller.logger
-        else:
+        elif self.logger is None:
             self.logger = RichFileLogger(
                 str(Path(self.config.logs_dir) / f"{self.name}.log"),
                 color=self.color_log,
@@ -579,7 +579,7 @@ class Task:
 
         if self.caller is not None and self.caller.tsv_logger is not None:
             self.tsv_logger = self.caller.tsv_logger
-        else:
+        elif self.tsv_logger is None:
             self.tsv_logger = setup_file_logger(
                 "tsv_logger",
                 str(Path(self.config.logs_dir) / f"{self.name}.tsv"),

{langroid-0.26.2 → langroid-0.27.1}/langroid/language_models/azure_openai.py

@@ -127,16 +127,28 @@ class AzureGPT(OpenAIGPT):
         Sets the chat model configuration based on the model name specified in the
         ``.env``. This function checks the `model_name` in the configuration and sets
         the appropriate chat model in the `config.chat_model`. It supports handling for
-        '35-turbo' and 'gpt-4' models. For 'gpt-4', it further delegates the handling
-        to `handle_gpt4_model` method. If the model name does not match any predefined
-        models, it defaults to `OpenAIChatModel.GPT4`.
+        'gpt-35-turbo', 'gpt4-turbo', 'gpt-4o' and 'gpt-4o-mini' models. For
+        'gpt-4', it further delegates the handling to `handle_gpt4_model` method.
+        If the model name does not match any predefined models, it defaults to
+        `OpenAIChatModel.GPT4`.
         """
-        MODEL_35_TURBO = "35-turbo"
-        MODEL_GPT4 = "gpt-4"
+        MODEL_35_TURBO_NAMES = ("gpt-35-turbo", "35-turbo")
+        MODEL_GPT4_TURBO_NAME = "gpt-4-turbo"
+        MODEL_GPT4o_NAME = "gpt-4o"
+        MODEL_GPT4o_MINI_NAME = "gpt-4o-mini"
+        MODEL_GPT4_PREFIX = "gpt-4"
 
-        if self.config.model_name == MODEL_35_TURBO:
+        if self.config.model_name in MODEL_35_TURBO_NAMES:
             self.config.chat_model = OpenAIChatModel.GPT3_5_TURBO
-        elif self.config.model_name == MODEL_GPT4:
+        elif self.config.model_name == MODEL_GPT4o_NAME:
+            self.config.chat_model = OpenAIChatModel.GPT4o
+        elif self.config.model_name == MODEL_GPT4o_MINI_NAME:
+            self.config.chat_model = OpenAIChatModel.GPT4o_MINI
+        elif self.config.model_name == MODEL_GPT4_TURBO_NAME:
+            self.config.chat_model = OpenAIChatModel.GPT4_TURBO
+        elif isinstance(
+            self.config.model_name, str
+        ) and self.config.model_name.startswith(MODEL_GPT4_PREFIX):
             self.handle_gpt4_model()
         else:
             self.config.chat_model = OpenAIChatModel.GPT4
@@ -153,8 +165,8 @@ class AzureGPT(OpenAIGPT):
         the version is '1106-Preview', otherwise, it defaults to
         setting `OpenAIChatModel.GPT4`.
         """
-        VERSION_1106_PREVIEW = "1106-Preview"
-        VERSIONS_GPT4o = ["2024-05-13", "2024-08-06", "2024-11-20"]
+        VERSIONS_GPT4_TURBO = ("1106-Preview", "2024-04-09")
+        VERSIONS_GPT4o = ("2024-05-13", "2024-08-06", "2024-11-20")
 
         if self.config.model_version == "":
             raise ValueError(
@@ -164,7 +176,7 @@ class AzureGPT(OpenAIGPT):
 
         if self.config.model_version in VERSIONS_GPT4o:
             self.config.chat_model = OpenAIChatModel.GPT4o
-        elif self.config.model_version == VERSION_1106_PREVIEW:
+        elif self.config.model_version in VERSIONS_GPT4_TURBO:
             self.config.chat_model = OpenAIChatModel.GPT4_TURBO
         else:
             self.config.chat_model = OpenAIChatModel.GPT4

{langroid-0.26.2 → langroid-0.27.1}/langroid/language_models/openai_gpt.py

@@ -67,6 +67,7 @@ if "OLLAMA_HOST" in os.environ:
 else:
     OLLAMA_BASE_URL = "http://localhost:11434/v1"
 
+OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1"
 GEMINI_BASE_URL = "https://generativelanguage.googleapis.com/v1beta/"
 GLHF_BASE_URL = "https://glhf.chat/api/openai/v1"
 OLLAMA_API_KEY = "ollama"
@@ -566,8 +567,10 @@ class OpenAIGPT(LanguageModel):
         self.is_cerebras = self.config.chat_model.startswith("cerebras/")
         self.is_gemini = self.config.chat_model.startswith("gemini/")
         self.is_glhf = self.config.chat_model.startswith("glhf/")
+        self.is_openrouter = self.config.chat_model.startswith("openrouter/")
 
         if self.is_groq:
+            # use groq-specific client
             self.config.chat_model = self.config.chat_model.replace("groq/", "")
             self.api_key = os.getenv("GROQ_API_KEY", DUMMY_API_KEY)
             self.client = Groq(
@@ -577,6 +580,7 @@ class OpenAIGPT(LanguageModel):
                 api_key=self.api_key,
             )
         elif self.is_cerebras:
+            # use cerebras-specific client
             self.config.chat_model = self.config.chat_model.replace("cerebras/", "")
             self.api_key = os.getenv("CEREBRAS_API_KEY", DUMMY_API_KEY)
             self.client = Cerebras(
@@ -587,6 +591,7 @@ class OpenAIGPT(LanguageModel):
                 api_key=self.api_key,
             )
         else:
+            # in these cases, there's no specific client: OpenAI python client suffices
             if self.is_gemini:
                 self.config.chat_model = self.config.chat_model.replace("gemini/", "")
                 self.api_key = os.getenv("GEMINI_API_KEY", DUMMY_API_KEY)
@@ -595,6 +600,12 @@ class OpenAIGPT(LanguageModel):
                 self.config.chat_model = self.config.chat_model.replace("glhf/", "")
                 self.api_key = os.getenv("GLHF_API_KEY", DUMMY_API_KEY)
                 self.api_base = GLHF_BASE_URL
+            elif self.is_openrouter:
+                self.config.chat_model = self.config.chat_model.replace(
+                    "openrouter/", ""
+                )
+                self.api_key = os.getenv("OPENROUTER_API_KEY", DUMMY_API_KEY)
+                self.api_base = OPENROUTER_BASE_URL
 
             self.client = OpenAI(
                 api_key=self.api_key,

{langroid-0.26.2 → langroid-0.27.1}/langroid/vector_store/chromadb.py

@@ -3,7 +3,6 @@ import logging
 from typing import Any, Dict, List, Optional, Sequence, Tuple
 
 from langroid.embedding_models.base import (
-    EmbeddingModel,
     EmbeddingModelsConfig,
 )
 from langroid.embedding_models.models import OpenAIEmbeddingsConfig
@@ -32,8 +31,7 @@ class ChromaDB(VectorStore):
         except ImportError:
             raise LangroidImportError("chromadb", "chromadb")
         self.config = config
-        emb_model = EmbeddingModel.create(config.embedding)
-        self.embedding_fn = emb_model.embedding_fn()
+        self.embedding_fn = self.embedding_model.embedding_fn()
         self.client = chromadb.Client(
             chromadb.config.Settings(
                 # chroma_db_impl="duckdb+parquet",
@@ -64,7 +62,7 @@ class ChromaDB(VectorStore):
             self.client.delete_collection(name=c.name)
         logger.warning(
             f"""
-            Deleted {n_empty_deletes} empty collections and 
+            Deleted {n_empty_deletes} empty collections and
             {n_non_empty_deletes} non-empty collections.
             """
         )

{langroid-0.26.2 → langroid-0.27.1}/langroid/vector_store/lancedb.py

@@ -22,7 +22,6 @@ if TYPE_CHECKING:
     from lancedb.query import LanceVectorQueryBuilder
 
 from langroid.embedding_models.base import (
-    EmbeddingModel,
     EmbeddingModelsConfig,
 )
 from langroid.embedding_models.models import OpenAIEmbeddingsConfig
@@ -61,9 +60,8 @@ class LanceDB(VectorStore):
             raise LangroidImportError("lancedb", "lancedb")
 
         self.config: LanceDBConfig = config
-        emb_model = EmbeddingModel.create(config.embedding)
-        self.embedding_fn: EmbeddingFunction = emb_model.embedding_fn()
-        self.embedding_dim = emb_model.embedding_dims
+        self.embedding_fn: EmbeddingFunction = self.embedding_model.embedding_fn()
+        self.embedding_dim = self.embedding_model.embedding_dims
         self.host = config.host
         self.port = config.port
         self.is_from_dataframe = False  # were docs ingested from a dataframe?
@@ -123,7 +121,7 @@ class LanceDB(VectorStore):
             self.client.drop_table(name)
         logger.warning(
             f"""
-            Deleted {n_empty_deletes} empty collections and 
+            Deleted {n_empty_deletes} empty collections and
             {n_non_empty_deletes} non-empty collections.
             """
         )
@@ -344,7 +342,7 @@ class LanceDB(VectorStore):
             raise ValueError(
                 f"""
             Error validating LanceDB result: {e}
-            HINT: This could happen when you're re-using an 
+            HINT: This could happen when you're re-using an
             existing LanceDB store with a different schema.
             Try deleting your local lancedb storage at `{self.config.storage_path}`
             re-ingesting your documents and/or replacing the collections.

{langroid-0.26.2 → langroid-0.27.1}/langroid/vector_store/momento.py

@@ -34,7 +34,6 @@ except ImportError:
 
 
 from langroid.embedding_models.base import (
-    EmbeddingModel,
     EmbeddingModelsConfig,
 )
 from langroid.embedding_models.models import OpenAIEmbeddingsConfig
@@ -62,9 +61,8 @@ class MomentoVI(VectorStore):
             raise LangroidImportError("momento", "momento")
         self.distance = SimilarityMetric.COSINE_SIMILARITY
         self.config: MomentoVIConfig = config
-        emb_model = EmbeddingModel.create(config.embedding)
-        self.embedding_fn: EmbeddingFunction = emb_model.embedding_fn()
-        self.embedding_dim = emb_model.embedding_dims
+        self.embedding_fn: EmbeddingFunction = self.embedding_model.embedding_fn()
+        self.embedding_dim = self.embedding_model.embedding_dims
         self.host = config.host
         self.port = config.port
         load_dotenv()
@@ -72,8 +70,8 @@ class MomentoVI(VectorStore):
         if config.cloud:
             if api_key is None:
                 raise ValueError(
-                    """MOMENTO_API_KEY env variable must be set to 
-                    MomentoVI hosted service. Please set this in your .env file. 
+                    """MOMENTO_API_KEY env variable must be set to
+                    MomentoVI hosted service. Please set this in your .env file.
                     """
                 )
             self.client = PreviewVectorIndexClient(

{langroid-0.26.2 → langroid-0.27.1}/langroid/vector_store/qdrantdb.py

@@ -23,7 +23,6 @@ from qdrant_client.http.models import (
 )
 
 from langroid.embedding_models.base import (
-    EmbeddingModel,
     EmbeddingModelsConfig,
 )
 from langroid.embedding_models.models import OpenAIEmbeddingsConfig
@@ -77,16 +76,15 @@ class QdrantDB(VectorStore):
     def __init__(self, config: QdrantDBConfig = QdrantDBConfig()):
         super().__init__(config)
         self.config: QdrantDBConfig = config
-        emb_model = EmbeddingModel.create(config.embedding)
-        self.embedding_fn: EmbeddingFunction = emb_model.embedding_fn()
-        self.embedding_dim = emb_model.embedding_dims
+        self.embedding_fn: EmbeddingFunction = self.embedding_model.embedding_fn()
+        self.embedding_dim = self.embedding_model.embedding_dims
         if self.config.use_sparse_embeddings:
             try:
                 from transformers import AutoModelForMaskedLM, AutoTokenizer
             except ImportError:
                 raise ImportError(
                     """
-                    To use sparse embeddings, 
+                    To use sparse embeddings,
                     you must install langroid with the [transformers] extra, e.g.:
                     pip install "langroid[transformers]"
                     """
@@ -117,10 +115,10 @@ class QdrantDB(VectorStore):
                 config.cloud = True
         elif config.cloud and None in [key, url]:
             logger.warning(
-                f"""QDRANT_API_KEY, QDRANT_API_URL env variable must be set to use 
-                QdrantDB in cloud mode. Please set these values 
-                in your .env file. 
-                Switching to local storage at {config.storage_path} 
+                f"""QDRANT_API_KEY, QDRANT_API_URL env variable must be set to use
+                QdrantDB in cloud mode. Please set these values
+                in your .env file.
+                Switching to local storage at {config.storage_path}
                 """
             )
             config.cloud = False
@@ -189,7 +187,7 @@ class QdrantDB(VectorStore):
             self.client.delete_collection(collection_name=name)
         logger.warning(
             f"""
-            Deleted {n_empty_deletes} empty collections and 
+            Deleted {n_empty_deletes} empty collections and
             {n_non_empty_deletes} non-empty collections.
             """
         )

{langroid-0.26.2 → langroid-0.27.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.26.2"
+version = "0.27.1"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"