agentica 0.1.2__tar.gz → 0.1.4__tar.gz

{agentica-0.1.2 → agentica-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agentica
-Version: 0.1.2
+Version: 0.1.4
 Summary: LLM agents
 Home-page: https://github.com/shibing624/agentica
 Author: XuMing
@@ -19,14 +19,14 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: loguru
-Requires-Dist: fire
+Requires-Dist: markdownify
 Requires-Dist: openai
 Requires-Dist: python-dotenv
 Requires-Dist: pydantic
 Requires-Dist: requests
 Requires-Dist: sqlalchemy
-Requires-Dist: markdownify
 Requires-Dist: tqdm
+Requires-Dist: rich
 
 [**🇨🇳中文**](https://github.com/shibing624/agentica/blob/main/README.md) | [**🌐English**](https://github.com/shibing624/agentica/blob/main/README_EN.md) | [**🇯🇵日本語**](https://github.com/shibing624/agentica/blob/main/README_JP.md)
 
@@ -91,9 +91,23 @@ pip install .
 
 ## Getting Started
 
-1. 复制[example.env](https://github.com/shibing624/agentica/blob/main/example.env)文件为`.env`，并粘贴DEEPSEEK_API_KEY(可选配OpenAI API key、Moonshoot API key等第三方LLM)。
+### 运行示例
+
+```shell
+git clone https://github.com/shibing624/agentica.git
+cd agentica
+pip install -r requirements.txt
+
+# Copying required .env file, and fill in the LLM api key
+cp .env.example ~/.agentica/.env
+
+cd examples
+python web_search_deepseek_demo.py
+```
+
+1. 复制[.env.example](https://github.com/shibing624/agentica/blob/main/.env.example)文件为`~/.agentica/.env`，并填写LLM api key(选填DEEPSEEK_API_KEY、MOONSHOT_API_KEY、OPENAI_API_KEY等任一个即可)。
 
-2. 使用`agentica`构建Agent，拆解任务并执行：
+2. 使用`agentica`构建Agent并执行：
 
 自动调用google搜索工具，示例[examples/web_search_deepseek_demo.py](https://github.com/shibing624/agentica/blob/main/examples/web_search_deepseek_demo.py)
 

{agentica-0.1.2 → agentica-0.1.4}/README.md

@@ -61,9 +61,23 @@ pip install .
 
 ## Getting Started
 
-1. 复制[example.env](https://github.com/shibing624/agentica/blob/main/example.env)文件为`.env`，并粘贴DEEPSEEK_API_KEY(可选配OpenAI API key、Moonshoot API key等第三方LLM)。
+### 运行示例
 
-2. 使用`agentica`构建Agent，拆解任务并执行：
+```shell
+git clone https://github.com/shibing624/agentica.git
+cd agentica
+pip install -r requirements.txt
+
+# Copying required .env file, and fill in the LLM api key
+cp .env.example ~/.agentica/.env
+
+cd examples
+python web_search_deepseek_demo.py
+```
+
+1. 复制[.env.example](https://github.com/shibing624/agentica/blob/main/.env.example)文件为`~/.agentica/.env`，并填写LLM api key(选填DEEPSEEK_API_KEY、MOONSHOT_API_KEY、OPENAI_API_KEY等任一个即可)。
+
+2. 使用`agentica`构建Agent并执行：
 
 自动调用google搜索工具，示例[examples/web_search_deepseek_demo.py](https://github.com/shibing624/agentica/blob/main/examples/web_search_deepseek_demo.py)
 

{agentica-0.1.2 → agentica-0.1.4}/agentica/__init__.py

@@ -4,7 +4,7 @@
 @description: 
 """
 from agentica.version import __version__  # noqa, isort: skip
-from agentica.config import DOTENV_PATH, SMART_LLM, FAST_LLM  # noqa, isort: skip
+from agentica.config import AGENTICA_DOTENV_PATH, SMART_LLM, FAST_LLM  # noqa, isort: skip
 # document
 from agentica.document import Document
 # vectordb

agentica-0.1.4/agentica/config.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+"""
+@author:XuMing(xuming624@qq.com)
+@description: 
+"""
+import os
+from datetime import datetime
+
+AGENTICA_HOME = os.environ.get("AGENTICA_HOME", os.path.expanduser("~/.agentica"))
+
+# Load environment variables from .env file
+AGENTICA_DOTENV_PATH = os.environ.get("AGENTICA_DOTENV_PATH", f"{AGENTICA_HOME}/.env")
+try:
+    from dotenv import load_dotenv  # noqa
+    from loguru import logger  # noqa, need to import logger here to avoid circular import
+
+    if load_dotenv(AGENTICA_DOTENV_PATH, override=True):
+        logger.info(f"Loaded AGENTICA_DOTENV_PATH: {AGENTICA_DOTENV_PATH}")
+except ImportError:
+    logger.debug("dotenv not installed, skipping...")
+
+AGENTICA_DATA_DIR = os.environ.get("AGENTICA_DATA_DIR", f"{AGENTICA_HOME}/data")
+AGENTICA_LOG_LEVEL = os.environ.get("AGENTICA_LOG_LEVEL", "INFO")
+AGENTICA_LOG_FILE = os.environ.get("AGENTICA_LOG_FILE")
+if AGENTICA_LOG_LEVEL.upper() == "DEBUG":
+    formatted_date = datetime.now().strftime("%Y%m%d")
+    default_log_file = f"{AGENTICA_HOME}/logs/{formatted_date}.log"
+    AGENTICA_LOG_FILE = os.environ.get("AGENTICA_LOG_FILE", default_log_file)
+    logger.debug(f"AGENTICA_LOG_LEVEL: DEBUG, AGENTICA_LOG_FILE: {AGENTICA_LOG_FILE}")
+
+SMART_LLM = os.environ.get("SMART_LLM")
+FAST_LLM = os.environ.get("FAST_LLM")

{agentica-0.1.2 → agentica-0.1.4}/agentica/file/base.py

@@ -1,4 +1,9 @@
-from typing import List, Optional, Any
+# -*- coding: utf-8 -*-
+"""
+@author:XuMing(xuming624@qq.com)
+@description:
+"""
+from typing import List, Optional, Any, Dict
 
 from pydantic import BaseModel
 
@@ -10,5 +15,5 @@ class File(BaseModel):
     data_path: Optional[str] = None
     type: str = "FILE"
 
-    def get_metadata(self) -> dict[str, Any]:
+    def get_metadata(self) -> Dict[str, Any]:
         return self.model_dump(exclude_none=True)

{agentica-0.1.2 → agentica-0.1.4}/agentica/file/csv.py

@@ -1,6 +1,12 @@
+# -*- coding: utf-8 -*-
+"""
+@author:XuMing(xuming624@qq.com)
+@description:
+"""
+from __future__ import annotations
 import csv
 from pathlib import Path
-from typing import Any
+from typing import Any, Dict
 
 from agentica.file.base import File
 from agentica.utils.log import logger
@@ -9,7 +15,7 @@ from agentica.utils.log import logger
 class CsvFile(File):
     type: str = "CSV"
 
-    def get_metadata(self) -> dict[str, Any]:
+    def get_metadata(self) -> Dict[str, Any]:
         if self.name is None:
             self.name = Path(self.data_path).name
 

{agentica-0.1.2 → agentica-0.1.4}/agentica/file/txt.py

@@ -1,5 +1,11 @@
+# -*- coding: utf-8 -*-
+"""
+@author:XuMing(xuming624@qq.com)
+@description:
+"""
+from __future__ import annotations
 from pathlib import Path
-from typing import Any
+from typing import Any, Dict
 
 from agentica.file.base import File
 
@@ -7,7 +13,7 @@ from agentica.file.base import File
 class TextFile(File):
     type: str = "TEXT"
 
-    def get_metadata(self) -> dict[str, Any]:
+    def get_metadata(self) -> Dict[str, Any]:
         if self.name is None:
             self.name = Path(self.data_path).name
         return self.model_dump(exclude_none=True)

{agentica-0.1.2 → agentica-0.1.4}/agentica/utils/file_parser.py

@@ -12,7 +12,7 @@ from pathlib import Path
 from typing import Optional
 
 import pandas as pd
-from agentica.config import DATA_DIR
+from agentica.config import AGENTICA_DATA_DIR
 from agentica.utils.log import logger
 
 

{agentica-0.1.2 → agentica-0.1.4}/agentica/utils/log.py

@@ -7,7 +7,7 @@ import sys
 
 from loguru import logger as _logger
 
-from agentica.config import LOG_FILE, LOG_LEVEL
+from agentica.config import AGENTICA_LOG_FILE, AGENTICA_LOG_LEVEL
 
 
 def get_logger(log_level: str = "INFO", log_file: str = None):
@@ -33,7 +33,7 @@ def get_logger(log_level: str = "INFO", log_file: str = None):
     return _logger
 
 
-logger = get_logger(log_level=LOG_LEVEL, log_file=LOG_FILE)
+logger = get_logger(log_level=AGENTICA_LOG_LEVEL, log_file=AGENTICA_LOG_FILE)
 
 
 def set_log_level_to_debug():
@@ -45,9 +45,9 @@ def set_log_level_to_debug():
         backtrace=True,
         diagnose=True,
     )
-    if LOG_FILE:
+    if AGENTICA_LOG_FILE:
         logger.add(
-            sink=LOG_FILE,
+            sink=AGENTICA_LOG_FILE,
             level="DEBUG",
             enqueue=True,
             backtrace=True,

agentica-0.1.4/agentica/version.py

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

{agentica-0.1.2 → agentica-0.1.4}/agentica.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agentica
-Version: 0.1.2
+Version: 0.1.4
 Summary: LLM agents
 Home-page: https://github.com/shibing624/agentica
 Author: XuMing
@@ -19,14 +19,14 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: loguru
-Requires-Dist: fire
+Requires-Dist: markdownify
 Requires-Dist: openai
 Requires-Dist: python-dotenv
 Requires-Dist: pydantic
 Requires-Dist: requests
 Requires-Dist: sqlalchemy
-Requires-Dist: markdownify
 Requires-Dist: tqdm
+Requires-Dist: rich
 
 [**🇨🇳中文**](https://github.com/shibing624/agentica/blob/main/README.md) | [**🌐English**](https://github.com/shibing624/agentica/blob/main/README_EN.md) | [**🇯🇵日本語**](https://github.com/shibing624/agentica/blob/main/README_JP.md)
 
@@ -91,9 +91,23 @@ pip install .
 
 ## Getting Started
 
-1. 复制[example.env](https://github.com/shibing624/agentica/blob/main/example.env)文件为`.env`，并粘贴DEEPSEEK_API_KEY(可选配OpenAI API key、Moonshoot API key等第三方LLM)。
+### 运行示例
+
+```shell
+git clone https://github.com/shibing624/agentica.git
+cd agentica
+pip install -r requirements.txt
+
+# Copying required .env file, and fill in the LLM api key
+cp .env.example ~/.agentica/.env
+
+cd examples
+python web_search_deepseek_demo.py
+```
+
+1. 复制[.env.example](https://github.com/shibing624/agentica/blob/main/.env.example)文件为`~/.agentica/.env`，并填写LLM api key(选填DEEPSEEK_API_KEY、MOONSHOT_API_KEY、OPENAI_API_KEY等任一个即可)。
 
-2. 使用`agentica`构建Agent，拆解任务并执行：
+2. 使用`agentica`构建Agent并执行：
 
 自动调用google搜索工具，示例[examples/web_search_deepseek_demo.py](https://github.com/shibing624/agentica/blob/main/examples/web_search_deepseek_demo.py)
 

{agentica-0.1.2 → agentica-0.1.4}/agentica.egg-info/requires.txt

@@ -1,9 +1,9 @@
 loguru
-fire
+markdownify
 openai
 python-dotenv
 pydantic
 requests
 sqlalchemy
-markdownify
 tqdm
+rich

{agentica-0.1.2 → agentica-0.1.4}/setup.py

@@ -39,14 +39,14 @@ setup(
     keywords='Agentica,Agent Tool,action,agent,agentica',
     install_requires=[
         "loguru",
-        "fire",
+        "markdownify",
         "openai",
         "python-dotenv",
         "pydantic",
         "requests",
         "sqlalchemy",
-        "markdownify",
         "tqdm",
+        "rich",
     ],
     packages=find_packages(),
 )

{agentica-0.1.2 → agentica-0.1.4}/tests/test_llm.py

@@ -8,7 +8,7 @@ This module contains tests for the LLM class.
 import os
 from unittest.mock import MagicMock, patch
 
-from agentica.config import DOTENV_PATH  # noqa
+from agentica.config import AGENTICA_DOTENV_PATH  # noqa
 from agentica.message import Message
 
 api_key = os.getenv("MOONSHOT_API_KEY")

{agentica-0.1.2 → agentica-0.1.4}/tests/test_moonshot_llm.py

@@ -12,7 +12,7 @@ import httpx
 from loguru import logger
 from openai import OpenAI
 
-from agentica.config import DOTENV_PATH  # noqa
+from agentica.config import AGENTICA_DOTENV_PATH  # noqa
 
 api_key = os.getenv("MOONSHOT_API_KEY")
 

agentica-0.1.2/agentica/config.py

@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-@author:XuMing(xuming624@qq.com)
-@description: 
-"""
-import os
-from datetime import datetime
-pwd_path = os.path.abspath(os.path.dirname(__file__))
-
-# Load environment variables from .env file
-env_path = os.path.realpath(os.path.join(pwd_path, "../.env"))
-DOTENV_PATH = os.environ.get("DOTENV_PATH", env_path)
-try:
-    from dotenv import load_dotenv  # noqa
-    from loguru import logger  # noqa, need to import logger here to avoid circular import
-
-    if load_dotenv(DOTENV_PATH, override=True):
-        logger.info(f"Loaded environment variables from {DOTENV_PATH}")
-except ImportError:
-    logger.debug("dotenv not installed, skipping...")
-
-AGENTICA_HOME = os.environ.get("AGENTICA_HOME", os.path.expanduser("~/.agentica"))
-DATA_DIR = os.environ.get("DATA_DIR", f"{AGENTICA_HOME}/data")
-current_date = datetime.now()
-formatted_date = current_date.strftime("%Y%m%d")
-LOG_FILE = os.environ.get("LOG_FILE", f"{AGENTICA_HOME}/logs/{formatted_date}.log")
-logger.debug(f"LOG_FILE: {LOG_FILE}")
-LOG_LEVEL = os.environ.get("LOG_LEVEL", "INFO")
-SMART_LLM = os.environ.get("SMART_LLM")
-FAST_LLM = os.environ.get("FAST_LLM")
-# Code-interpreter E2B api key
-E2B_API_KEY = os.environ.get("E2B_API_KEY")
-
-# Model token limit
-MODEL_TOKEN_LIMIT = {
-    "gpt-3.5-turbo": 4096,
-    "gpt-3.5-turbo-instruct": 4096,
-    "gpt-3.5-turbo-16k": 16384,
-    "gpt-3.5-turbo-1106": 16384,
-    "gpt-3.5-turbo-16k-0613": 16384,
-    "gpt-4": 8192,
-    "gpt-4-32k": 32768,
-    "gpt-4-1106-preview": 128000,
-    "gpt-4-0125-preview": 128000,
-    "gpt-4-vision-preview": 128000,
-    "gpt-4-turbo": 128000,
-    "gpt-4-turbo-preview": 128000,
-    "gpt-4-turbo-2024-04-09": 128000,
-    "gpt-4o": 128000,
-    "gpt-4o-2024-05-13": 128000,
-    "moonshot-v1-8k": 8000,
-    "moonshot-v1-32k": 32000,
-    "moonshot-v1-128k": 128000,
-    "deepseek-chat": 128000,
-    "deepseek-coder": 128000,
-}

agentica-0.1.2/agentica/version.py

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