agentica 0.1.5__tar.gz → 0.1.6__tar.gz

{agentica-0.1.5 → agentica-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agentica
-Version: 0.1.5
+Version: 0.1.6
 Summary: LLM agents
 Home-page: https://github.com/shibing624/agentica
 Author: XuMing
@@ -116,11 +116,11 @@ python web_search_deepseek_demo.py
 自动调用google搜索工具，示例[examples/web_search_deepseek_demo.py](https://github.com/shibing624/agentica/blob/main/examples/web_search_deepseek_demo.py)
 
 ```python
-from agentica import Assistant, Deepseek
+from agentica import Assistant, DeepseekLLM
 from agentica.tools.search_serper import SearchSerperTool
 
 m = Assistant(
-  llm=Deepseek(),
+  llm=DeepseekLLM(),
   description="You are a helpful ai assistant.",
   show_tool_calls=True,
   # Enable the assistant to search the knowledge base

{agentica-0.1.5 → agentica-0.1.6}/README.md

@@ -85,11 +85,11 @@ python web_search_deepseek_demo.py
 自动调用google搜索工具，示例[examples/web_search_deepseek_demo.py](https://github.com/shibing624/agentica/blob/main/examples/web_search_deepseek_demo.py)
 
 ```python
-from agentica import Assistant, Deepseek
+from agentica import Assistant, DeepseekLLM
 from agentica.tools.search_serper import SearchSerperTool
 
 m = Assistant(
-  llm=Deepseek(),
+  llm=DeepseekLLM(),
   description="You are a helpful ai assistant.",
   show_tool_calls=True,
   # Enable the assistant to search the knowledge base

{agentica-0.1.5 → agentica-0.1.6}/agentica/__init__.py

@@ -7,14 +7,14 @@ from agentica.version import __version__  # noqa, isort: skip
 from agentica.config import AGENTICA_HOME, AGENTICA_DOTENV_PATH, SMART_LLM, FAST_LLM  # noqa, isort: skip
 
 # llm
-from agentica.llm.openai_chat import OpenAIChat
-from agentica.llm.azure_openai import AzureOpenAIChat
-from agentica.llm.together import Together
-from agentica.llm.deepseek import Deepseek
-from agentica.llm.moonshot import Moonshot
-from agentica.llm.ollama_chat import OllamaChat
-from agentica.llm.ollama_tools import OllamaTools
-from agentica.llm.claude import Claude
+from agentica.llm.openai_llm import OpenAILLM
+from agentica.llm.azure_openai_llm import AzureOpenAILLM
+from agentica.llm.togetherllm import TogetherLLM
+from agentica.llm.deepseek_llm import DeepseekLLM
+from agentica.llm.moonshot_llm import MoonshotLLM
+from agentica.llm.ollama_llm import OllamaLLM
+from agentica.llm.ollama_tools_llm import OllamaToolsLLM
+from agentica.llm.claude_llm import ClaudeLLM
 
 # memory
 from agentica.message import Message
@@ -40,13 +40,14 @@ from agentica.vectordb.base import VectorDb
 from agentica.vectordb.memory_vectordb import MemoryVectorDb
 # emb
 from agentica.emb.base import Emb
-from agentica.emb.openai import OpenAIEmb
-from agentica.emb.azure_openai import AzureOpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
+from agentica.emb.azure_openai_emb import AzureOpenAIEmb
 from agentica.emb.hash_emb import HashEmb
-from agentica.emb.together import TogetherEmb
-from agentica.emb.fireworks import FireworksEmb
-from agentica.emb.text2vec import Text2VecEmb
-from agentica.emb.word2vec import Word2VecEmb
+from agentica.emb.ollama_emb import OllamaEmb
+from agentica.emb.together_emb import TogetherEmb
+from agentica.emb.fireworks_emb import FireworksEmb
+from agentica.emb.text2vec_emb import Text2VecEmb
+from agentica.emb.word2vec_emb import Word2VecEmb
 
 # file
 from agentica.file.base import File

{agentica-0.1.5 → agentica-0.1.6}/agentica/assistant.py

@@ -31,7 +31,7 @@ from pydantic import BaseModel, ConfigDict, field_validator, ValidationError
 from agentica.document import Document
 from agentica.knowledge.knowledge_base import KnowledgeBase
 from agentica.llm.base import LLM
-from agentica.llm.openai_chat import OpenAIChat
+from agentica.llm.openai_llm import OpenAILLM
 from agentica.memory import AssistantMemory, Memory
 from agentica.message import Message
 from agentica.references import References
@@ -279,7 +279,7 @@ class Assistant(BaseModel):
     def update_llm(self) -> None:
         if self.llm is None:
             logger.debug("LLM not set. Using OpenAILLM")
-            self.llm = OpenAIChat()
+            self.llm = OpenAILLM()
             logger.info(f"Using LLM: {self.llm}")
         else:
             logger.debug(f"Using LLM: {self.llm}")

agentica-0.1.5/agentica/emb/fireworks.py → agentica-0.1.6/agentica/emb/fireworks_emb.py

@@ -6,7 +6,7 @@ part of the code from https://github.com/phidatahq/phidata
 from os import getenv
 from typing import Optional
 
-from agentica.emb.openai import OpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
 
 
 class FireworksEmb(OpenAIEmb):

agentica-0.1.5/agentica/emb/huggingface.py → agentica-0.1.6/agentica/emb/huggingface_emb.py

@@ -14,7 +14,7 @@ except ImportError:
     raise ImportError("`huggingface-hub` not installed, please run `pip install huggingface-hub`")
 
 
-class HuggingfaceCustomEmb(Emb):
+class HuggingfaceEmb(Emb):
     """Huggingface Custom Embedder"""
 
     model: str = "jinaai/jina-embeddings-v2-base-code"
@@ -42,12 +42,12 @@ class HuggingfaceCustomEmb(Emb):
         return self.client.post(**_request_params)
 
     def get_embedding(self, text: str) -> List[float]:
-        response = self._response(text=text)
+        resp = []
         try:
-            return response
+            resp = self._response(text=text)
         except Exception as e:
             logger.warning(e)
-            return []
+        return resp
 
     def get_embedding_and_usage(self, text: str) -> Tuple[List[float], Optional[Dict]]:
         return super().get_embedding_and_usage(text)

agentica-0.1.5/agentica/emb/ollama.py → agentica-0.1.6/agentica/emb/ollama_emb.py

@@ -4,16 +4,11 @@
 @description:
 part of the code from https://github.com/phidatahq/phidata
 """
-from typing import Optional, Dict, List, Any,Tuple
+from typing import Optional, Dict, List, Any, Tuple
 
 from agentica.emb.base import Emb
 from agentica.utils.log import logger
 
-try:
-    from ollama import Client as OllamaClient
-except ImportError:
-    raise ImportError("`ollama` not installed, please install it via `pip install ollama`")
-
 
 class OllamaEmb(Emb):
     model: str = "quentinz/bge-base-zh-v1.5"
@@ -22,10 +17,15 @@ class OllamaEmb(Emb):
     timeout: Optional[Any] = None
     options: Optional[Any] = None
     client_kwargs: Optional[Dict[str, Any]] = None
-    ollama_client: Optional[OllamaClient] = None
+    ollama_client: Optional[Any] = None
 
     @property
-    def client(self) -> OllamaClient:
+    def client(self) -> Any:
+        try:
+            from ollama import Client as OllamaClient
+        except ImportError:
+            raise ImportError("`ollama` not installed, please run `pip install ollama`")
+
         if self.ollama_client:
             return self.ollama_client
 
@@ -58,4 +58,3 @@ class OllamaEmb(Emb):
 
     def get_embeddings(self, texts: List[str]) -> List[List[float]]:
         return [self.get_embedding(text) for text in texts]
-

agentica-0.1.5/agentica/emb/together.py → agentica-0.1.6/agentica/emb/together_emb.py

@@ -7,7 +7,7 @@ part of the code from https://github.com/phidatahq/phidata
 from os import getenv
 from typing import Optional
 
-from agentica.emb.openai import OpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
 
 
 class TogetherEmb(OpenAIEmb):

{agentica-0.1.5 → agentica-0.1.6}/agentica/llm/__init__.py

@@ -3,6 +3,6 @@
 @author:XuMing(xuming624@qq.com)
 @description: 
 """
-from .azure_openai import AzureOpenAIChat
+from .azure_openai_llm import AzureOpenAILLM
 from .base import LLM
-from .openai_chat import OpenAIChat
+from .openai_llm import OpenAILLM

agentica-0.1.5/agentica/llm/azure_openai.py → agentica-0.1.6/agentica/llm/azure_openai_llm.py

@@ -10,12 +10,12 @@ from typing import Optional, Dict, Any, List, Iterator
 from openai import AzureOpenAI as AzureOpenAIClient
 from openai.types.chat.chat_completion_chunk import ChatCompletionChunk
 from agentica.config import FAST_LLM
-from agentica.llm.openai_chat import OpenAIChat
+from agentica.llm.openai_llm import OpenAILLM
 from agentica.message import Message
 
 
-class AzureOpenAIChat(OpenAIChat):
-    name: str = "AzureOpenAIChat"
+class AzureOpenAILLM(OpenAILLM):
+    name: str = "AzureOpenAILLM"
     model: str = FAST_LLM or "gpt-4o"
     api_key: Optional[str] = getenv("AZURE_OPENAI_API_KEY")
     api_version: str = getenv("AZURE_OPENAI_API_VERSION", "2024-02-01")

agentica-0.1.5/agentica/llm/claude.py → agentica-0.1.6/agentica/llm/claude_llm.py

@@ -30,8 +30,8 @@ except ImportError:
     anthropic_installed = False
 
 
-class Claude(LLM):
-    name: str = "Claude"
+class ClaudeLLM(LLM):
+    name: str = "ClaudeLLM"
     model: str = "claude-3-opus-20240229"
     # -*- Request parameters
     max_tokens: Optional[int] = 1024

agentica-0.1.5/agentica/llm/deepseek.py → agentica-0.1.6/agentica/llm/deepseek_llm.py

@@ -56,11 +56,11 @@ from typing import Optional, Dict, Any
 
 from openai import OpenAI as OpenAIClient, AsyncOpenAI as AsyncOpenAIClient
 
-from agentica.llm.openai_chat import OpenAIChat
+from agentica.llm.openai_llm import OpenAILLM
 
 
-class Deepseek(OpenAIChat):
-    name: str = "Deepseek"
+class DeepseekLLM(OpenAILLM):
+    name: str = "DeepseekLLM"
     model: str = "deepseek-coder"
     api_key: Optional[str] = getenv("DEEPSEEK_API_KEY")
     base_url: str = "https://api.deepseek.com/v1"

agentica-0.1.5/agentica/llm/moonshot.py → agentica-0.1.6/agentica/llm/moonshot_llm.py

@@ -8,11 +8,11 @@ from typing import Optional, Dict, Any
 
 from openai import OpenAI as OpenAIClient, AsyncOpenAI as AsyncOpenAIClient
 
-from agentica.llm.openai_chat import OpenAIChat
+from agentica.llm.openai_llm import OpenAILLM
 
 
-class Moonshot(OpenAIChat):
-    name: str = "Moonshot"
+class MoonshotLLM(OpenAILLM):
+    name: str = "MoonshotLLM"
     model: str = "moonshot-v1-auto"
     api_key: Optional[str] = getenv("MOONSHOT_API_KEY")
     base_url: str = "https://api.moonshot.cn/v1"

agentica-0.1.5/agentica/llm/ollama_chat.py → agentica-0.1.6/agentica/llm/ollama_llm.py

@@ -97,7 +97,7 @@ def extract_tool_calls(assistant_msg_content: str) -> MessageToolCallExtractionR
     return MessageToolCallExtractionResult(tool_calls=tool_calls, invalid_json_format=False)
 
 
-class OllamaChat(LLM):
+class OllamaLLM(LLM):
     name: str = "OllamaChat"
     model: str = "openhermes"  # or "qwen:0.5b" for test
     host: Optional[str] = None

agentica-0.1.5/agentica/llm/ollama_tools.py → agentica-0.1.6/agentica/llm/ollama_tools_llm.py

@@ -32,7 +32,7 @@ def remove_tool_calls_from_string(text: str, start_tag: str = "<tool_call>", end
     return text
 
 
-class OllamaTools(LLM):
+class OllamaToolsLLM(LLM):
     name: str = "OllamaTools"
     model: str = "llama3"
     host: Optional[str] = None

agentica-0.1.5/agentica/llm/openai_chat.py → agentica-0.1.6/agentica/llm/openai_llm.py

@@ -32,8 +32,8 @@ from agentica.utils.log import logger
 from agentica.utils.timer import Timer
 
 
-class OpenAIChat(LLM):
-    name: str = "OpenAIChat"
+class OpenAILLM(LLM):
+    name: str = "OpenAILLM"
     model: str = FAST_LLM or "gpt-4o-mini"
     # -*- Request parameters
     frequency_penalty: Optional[float] = None

agentica-0.1.5/agentica/llm/together.py → agentica-0.1.6/agentica/llm/togetherllm.py

@@ -8,14 +8,14 @@ import json
 from os import getenv
 from typing import Optional, List, Iterator, Dict, Any
 
-from agentica.llm.openai_chat import OpenAIChat
+from agentica.llm.openai_llm import OpenAILLM
 from agentica.message import Message
 from agentica.tools.base import FunctionCall, get_function_call_for_tool_call
 from agentica.utils.log import logger
 from agentica.utils.timer import Timer
 
 
-class Together(OpenAIChat):
+class TogetherLLM(OpenAILLM):
     name: str = "Together"
     model: str = "mistralai/Mixtral-8x7B-Instruct-v0.1"
     api_key: Optional[str] = getenv("TOGETHER_API_KEY")

{agentica-0.1.5 → agentica-0.1.6}/agentica/memory.py

@@ -18,7 +18,7 @@ from pydantic import BaseModel, ConfigDict, model_validator
 
 from agentica.config import AGENTICA_HOME
 from agentica.llm.base import LLM
-from agentica.llm.openai_chat import OpenAIChat
+from agentica.llm.openai_llm import OpenAILLM
 from agentica.message import Message
 from agentica.references import References
 from agentica.utils.log import logger
@@ -287,7 +287,7 @@ class MemoryManager(BaseModel):
 
     def update_llm(self) -> None:
         if self.llm is None:
-            self.llm = OpenAIChat()
+            self.llm = OpenAILLM()
             logger.debug(f"Using LLM: {self.llm}")
         self.llm.add_tool(self.add_memory)
         self.llm.add_tool(self.update_memory)
@@ -456,7 +456,7 @@ class MemoryClassifier(BaseModel):
 
     def update_llm(self) -> None:
         if self.llm is None:
-            self.llm = OpenAIChat()
+            self.llm = OpenAILLM()
             logger.debug(f"Using LLM: {self.llm}")
 
     def get_system_prompt(self) -> Optional[str]:

{agentica-0.1.5 → agentica-0.1.6}/agentica/tools/analyze_image.py

@@ -9,7 +9,7 @@ import base64
 import os
 from typing import Optional, cast
 
-from agentica.llm import LLM, OpenAIChat
+from agentica.llm import LLM, OpenAILLM
 from agentica.tools.base import Toolkit
 from agentica.utils.log import logger
 
@@ -37,7 +37,7 @@ class AnalyzeImageTool(Toolkit):
 
     def update_llm(self) -> None:
         if self.llm is None:
-            self.llm = OpenAIChat()
+            self.llm = OpenAILLM()
 
     def analyze_image_content(self, image_path_or_url: str) -> str:
         """

{agentica-0.1.5 → agentica-0.1.6}/agentica/tools/create_image.py

@@ -12,7 +12,7 @@ from typing import Optional, cast
 
 import requests
 
-from agentica.llm import LLM, OpenAIChat
+from agentica.llm import LLM, OpenAILLM
 from agentica.tools.base import Toolkit
 
 
@@ -36,7 +36,7 @@ class CreateImageTool(Toolkit):
 
     def update_llm(self) -> None:
         if self.llm is None:
-            self.llm = OpenAIChat()
+            self.llm = OpenAILLM()
 
     def create_delle_image(self, prompt: str, n: int = 1, size: str = "1024x1024", model: str = 'dall-e-3') -> str:
         """

{agentica-0.1.5 → agentica-0.1.6}/agentica/vectordb/chromadb.py

@@ -19,7 +19,7 @@ except ImportError:
 
 from agentica.document import Document
 from agentica.emb.base import Emb
-from agentica.emb.openai import OpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
 from agentica.vectordb.base import VectorDb, Distance
 from agentica.utils.log import logger
 

{agentica-0.1.5 → agentica-0.1.6}/agentica/vectordb/lancedb.py

@@ -20,7 +20,7 @@ except ImportError:
 from agentica.document import Document
 from agentica.emb.base import Emb
 from agentica.vectordb.base import VectorDb, Distance
-from agentica.emb.openai import OpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
 from agentica.utils.log import logger
 
 

{agentica-0.1.5 → agentica-0.1.6}/agentica/vectordb/memory_vectordb.py

@@ -11,7 +11,7 @@ import numpy as np
 
 from agentica.document import Document
 from agentica.emb.base import Emb
-from agentica.emb.openai import OpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
 from agentica.vectordb.base import VectorDb, Distance
 
 

{agentica-0.1.5 → agentica-0.1.6}/agentica/vectordb/pgvector.py

@@ -19,7 +19,7 @@ except ImportError:
 from agentica.document import Document
 from agentica.emb.base import Emb
 from agentica.vectordb.base import VectorDb, Distance
-from agentica.emb.openai import OpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
 from agentica.utils.log import logger
 
 

{agentica-0.1.5 → agentica-0.1.6}/agentica/vectordb/pineconedb.py

@@ -12,7 +12,7 @@ except ImportError:
 
 from agentica.document import Document
 from agentica.emb.base import Emb
-from agentica.emb.openai import OpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
 from agentica.vectordb.base import VectorDb, Distance
 from agentica.utils.log import logger
 

{agentica-0.1.5 → agentica-0.1.6}/agentica/vectordb/qdrant.py

@@ -11,7 +11,7 @@ except ImportError:
 
 from agentica.document import Document
 from agentica.emb.base import Emb
-from agentica.emb.openai import OpenAIEmb
+from agentica.emb.openai_emb import OpenAIEmb
 from agentica.vectordb.base import VectorDb, Distance
 from agentica.utils.log import logger
 

agentica-0.1.6/agentica/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.6"

{agentica-0.1.5 → agentica-0.1.6}/agentica.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agentica
-Version: 0.1.5
+Version: 0.1.6
 Summary: LLM agents
 Home-page: https://github.com/shibing624/agentica
 Author: XuMing
@@ -116,11 +116,11 @@ python web_search_deepseek_demo.py
 自动调用google搜索工具，示例[examples/web_search_deepseek_demo.py](https://github.com/shibing624/agentica/blob/main/examples/web_search_deepseek_demo.py)
 
 ```python
-from agentica import Assistant, Deepseek
+from agentica import Assistant, DeepseekLLM
 from agentica.tools.search_serper import SearchSerperTool
 
 m = Assistant(
-  llm=Deepseek(),
+  llm=DeepseekLLM(),
   description="You are a helpful ai assistant.",
   show_tool_calls=True,
   # Enable the assistant to search the knowledge base

{agentica-0.1.5 → agentica-0.1.6}/agentica.egg-info/SOURCES.txt

@@ -22,18 +22,18 @@ agentica.egg-info/not-zip-safe
 agentica.egg-info/requires.txt
 agentica.egg-info/top_level.txt
 agentica/emb/__init__.py
-agentica/emb/azure_openai.py
+agentica/emb/azure_openai_emb.py
 agentica/emb/base.py
-agentica/emb/fireworks.py
-agentica/emb/genimi.py
+agentica/emb/fireworks_emb.py
+agentica/emb/genimi_emb.py
 agentica/emb/hash_emb.py
-agentica/emb/huggingface.py
-agentica/emb/ollama.py
-agentica/emb/openai.py
-agentica/emb/sentence_transformer.py
-agentica/emb/text2vec.py
-agentica/emb/together.py
-agentica/emb/word2vec.py
+agentica/emb/huggingface_emb.py
+agentica/emb/ollama_emb.py
+agentica/emb/openai_emb.py
+agentica/emb/sentence_transformer_emb.py
+agentica/emb/text2vec_emb.py
+agentica/emb/together_emb.py
+agentica/emb/word2vec_emb.py
 agentica/file/__init__.py
 agentica/file/base.py
 agentica/file/csv.py
@@ -43,15 +43,15 @@ agentica/knowledge/knowledge_base.py
 agentica/knowledge/langchain.py
 agentica/knowledge/llamaindex.py
 agentica/llm/__init__.py
-agentica/llm/azure_openai.py
+agentica/llm/azure_openai_llm.py
 agentica/llm/base.py
-agentica/llm/claude.py
-agentica/llm/deepseek.py
-agentica/llm/moonshot.py
-agentica/llm/ollama_chat.py
-agentica/llm/ollama_tools.py
-agentica/llm/openai_chat.py
-agentica/llm/together.py
+agentica/llm/claude_llm.py
+agentica/llm/deepseek_llm.py
+agentica/llm/moonshot_llm.py
+agentica/llm/ollama_llm.py
+agentica/llm/ollama_tools_llm.py
+agentica/llm/openai_llm.py
+agentica/llm/togetherllm.py
 agentica/storage/__init__.py
 agentica/storage/base.py
 agentica/storage/pg_storage.py

{agentica-0.1.5 → agentica-0.1.6}/tests/test_llm.py

@@ -8,11 +8,8 @@ This module contains tests for the LLM class.
 import os
 from unittest.mock import MagicMock, patch
 
-from agentica.config import AGENTICA_DOTENV_PATH  # noqa
 from agentica.message import Message
 
-api_key = os.getenv("MOONSHOT_API_KEY")
-
 
 @patch("agentica.llm.openai_llm.OpenAILLM")
 def test_respond(mock_llm_class):

agentica-0.1.5/agentica/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.5"