fyodorov-llm-agents 0.4.18__py3-none-any.whl → 0.4.20__py3-none-any.whl

fyodorov_llm_agents/agents/agent_model.py

@@ -18,7 +18,7 @@ class Agent(BaseModel):
     tools: list[str] = []
     rag: list[dict] = []
     model: str | None = None
-    modelid: str | None = None
+    model_id: int | None = None
     name: str = "My Agent"
     description: str = "My Agent Description"
     prompt: str = "My Prompt"
@@ -72,6 +72,7 @@ class Agent(BaseModel):
         #     'rag': self.rag,
         # }
 
+
     async def call_with_fn_calling(self, input: str = "", history = [], user_id: str = "") -> dict:
         litellm.set_verbose = True
         model = self.model

fyodorov_llm_agents/instances/instance_model.py

@@ -5,8 +5,8 @@ MAX_TITLE_LENGTH = 80
 VALID_CHARACTERS_REGEX = r'^[a-zA-Z0-9\s.,!?:;\'"-]+$'
 
 class InstanceModel(BaseModel):
-    id: str = Field(None, alias='id')
-    agent_id: str # Links to AgentModel.id
+    id: int = Field(None, alias='id')
+    agent_id: int # Links to AgentModel.id
     title: str = ""
     chat_history: list[dict] = []
 

fyodorov_llm_agents/instances/instance_service.py

@@ -19,7 +19,7 @@ class Instance(InstanceModel):
 
     async def chat_w_fn_calls(self, input: str = "", access_token: str = JWT, user_id: str = "") -> str:
         agent: AgentModel = await Agent.get_in_db(access_token=access_token, id = self.agent_id)
-        model: LLMModel = await LLM.get_model(access_token, user_id, id = agent.modelid)
+        model: LLMModel = await LLM.get_model(access_token, user_id, id = agent.model_id)
         print(f"Model fetched via LLM.get_model in chat_w_fn_calls: {model}")
         provider: Provider = await Provider.get_provider_by_id(access_token, id = model.provider)
         agent.prompt = f"{agent.prompt}\n\n{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n\n"

fyodorov_llm_agents/models/llm_model.py

@@ -1,8 +1,8 @@
-from pydantic import BaseModel, HttpUrl
-from typing import Literal
+from pydantic import BaseModel, validator
+from fyodorov_llm_agents.providers.provider_model import Provider as ProviderTypes
 
 class LLMModel(BaseModel):
-    id: str | None = None
+    id: int | None = None
     name: str
     provider: str
     params: dict | None = None
@@ -12,6 +12,12 @@ class LLMModel(BaseModel):
     output_cost_per_token: float | None = None
     max_tokens: int | None = None
 
+    @validator('provider')
+    def validate_provider(cls, v):
+        if v not in ProviderTypes:
+            raise ValueError('Invalid provider')
+        return str(v)
+
     def to_dict(self):
         return {
             'name': self.name,

fyodorov_llm_agents/providers/provider_model.py

@@ -4,7 +4,7 @@ from typing import Literal
 Provider = Literal['openai', 'mistral', 'ollama', 'openrouter']
 
 class ProviderModel(BaseModel):
-    id: str | None = None
+    id: int | None = None
     name: Provider
     api_key: str | None = None
     api_url: HttpUrl | None = None

fyodorov_llm_agents/tools/mcp_tool_model.py

@@ -26,7 +26,7 @@ class MCPTool(BaseModel):
     handle: Optional[str] = None
     description: Optional[str] = Field(None, max_length=MAX_DESCRIPTION_LENGTH)
     logo_url: Optional[str] = None                    # stored as text; could be a URL
-    user_id: Optional[str] = None                     # uuid
+    user_id: Optional[int] = None                     # uuid
 
     public: Optional[bool] = False
     api_type: Optional[str] = None

{fyodorov_llm_agents-0.4.18.dist-info → fyodorov_llm_agents-0.4.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fyodorov_llm_agents
-Version: 0.4.18
+Version: 0.4.20
 Summary: LLM agents for the Fyodorov AI suite
 Author-email: Daniel Ransom <02masseur.alibis@icloud.com>
 Project-URL: Homepage, https://github.com/FyodorovAI/fyodorov-llm-agents

fyodorov_llm_agents-0.4.20.dist-info/RECORD

@@ -0,0 +1,17 @@
+fyodorov_llm_agents/base_model.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fyodorov_llm_agents/agents/agent_model.py,sha256=rsBjOHDHLq5S4Sv8KZDQqAT_1903UFT0_-ASH9WGzsg,6841
+fyodorov_llm_agents/agents/agent_service.py,sha256=qm3oGtgrbTV3LfmVYTIrZDs4GwmghdRAxxb3gkrS2i4,6553
+fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
+fyodorov_llm_agents/instances/instance_model.py,sha256=Kdte858w9AtjgJHtYtuHO2D0pNg186JZZLCWZQPG4D0,1206
+fyodorov_llm_agents/instances/instance_service.py,sha256=ssCBa2NqDw8sbreKozKMKsrIO4ZC9M_MEbFoSFyr9jY,8968
+fyodorov_llm_agents/models/llm_model.py,sha256=9m2vP3OESsGjc8yj9idYReuCA1jU0g-boAML_9J1loo,1872
+fyodorov_llm_agents/models/llm_service.py,sha256=L_YxZIotlPea0ymUfYXY24rdnCuZdOZEMTDrh8J_BAM,4562
+fyodorov_llm_agents/providers/provider_model.py,sha256=i9aqtuMUERng54hOYTArt4aq0uU4b2wyCZCfJ39RbEI,957
+fyodorov_llm_agents/providers/provider_service.py,sha256=pvb43ZdF8zFzgP2GELCSE8rDxjjsYe-s0RlcTa8vWIE,6588
+fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=JM4XItd9TEprDd7Xuz4hCYcPMRL2LVdJ3Fh7CoMug3A,5110
+fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=nOWeCXFP8t7pbFL4Co70c7ukEEl-TQbb1pnPHlG5Tac,7677
+fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
+fyodorov_llm_agents-0.4.20.dist-info/METADATA,sha256=uhcFx1426syOAGuhELRGbm1Ehm5fcJhrlUWOZyAHAeA,551
+fyodorov_llm_agents-0.4.20.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fyodorov_llm_agents-0.4.20.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.20.dist-info/RECORD,,

fyodorov_llm_agents-0.4.18.dist-info/RECORD

@@ -1,16 +0,0 @@
-fyodorov_llm_agents/agents/agent_model.py,sha256=UN8KJvPWsoiatBM3Pw0X8bt0G0pGJeEf4vOTMBITnKU,6839
-fyodorov_llm_agents/agents/agent_service.py,sha256=qm3oGtgrbTV3LfmVYTIrZDs4GwmghdRAxxb3gkrS2i4,6553
-fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
-fyodorov_llm_agents/instances/instance_model.py,sha256=PQaoVSH9H4qp_wcLvyT_QgvNtwf9oehOxZaGI6mv1bA,1206
-fyodorov_llm_agents/instances/instance_service.py,sha256=MNUJTKQnt62GiRpyBmGWJSht96ERchEVBlRamnAQv3s,8967
-fyodorov_llm_agents/models/llm_model.py,sha256=aQtXtB7kRpnVdbPu-nmTGAaflbtKz3DPkgcckf1srsg,1645
-fyodorov_llm_agents/models/llm_service.py,sha256=L_YxZIotlPea0ymUfYXY24rdnCuZdOZEMTDrh8J_BAM,4562
-fyodorov_llm_agents/providers/provider_model.py,sha256=OyCK6WMRhyElsp88gILg0wso-OPHI7f55gEeypsJ7O0,957
-fyodorov_llm_agents/providers/provider_service.py,sha256=pvb43ZdF8zFzgP2GELCSE8rDxjjsYe-s0RlcTa8vWIE,6588
-fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=nGdPmqSkA7hqDUTPbNCZAHNSVJCgVOs5dzJfPntLidI,5110
-fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=nOWeCXFP8t7pbFL4Co70c7ukEEl-TQbb1pnPHlG5Tac,7677
-fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.4.18.dist-info/METADATA,sha256=H4n2H1IvfVVwt5XbcjqGhZsgj9nfUVgUtoaO7RGQqx4,551
-fyodorov_llm_agents-0.4.18.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fyodorov_llm_agents-0.4.18.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.18.dist-info/RECORD,,