flo-ai 1.0.0.dev4__tar.gz → 1.0.0.dev6__tar.gz

{flo_ai-1.0.0.dev4 → flo_ai-1.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flo_ai
-Version: 1.0.0.dev4
+Version: 1.0.0.dev6
 Summary: A easy way to create structured AI agents
 License: MIT
 Author: rootflo

{flo_ai-1.0.0.dev4 → flo_ai-1.0.0.dev6}/flo_ai/__init__.py

@@ -8,7 +8,7 @@ from .models import Agent, AgentError, BaseAgent, AgentType, ReasoningPattern
 from .builder.agent_builder import AgentBuilder
 
 # LLM package - Language model integrations
-from .llm import BaseLLM, Anthropic, OpenAI, OllamaLLM, Gemini
+from .llm import BaseLLM, Anthropic, OpenAI, OllamaLLM, Gemini, OpenAIVLLM, ImageMessage
 
 # Tool package - Tool framework components
 from .tool import Tool, ToolExecutionError, flo_tool, create_tool_from_function
@@ -43,6 +43,9 @@ __all__ = [
     'OpenAI',
     'OllamaLLM',
     'Gemini',
+    'OpenAIVLLM',
+    # LLM DataClass
+    'ImageMessage',
     # Tools
     'Tool',
     'ToolExecutionError',

flo_ai-1.0.0.dev6/flo_ai/llm/__init__.py

@@ -0,0 +1,16 @@
+from .base_llm import BaseLLM, ImageMessage
+from .anthropic_llm import Anthropic
+from .openai_llm import OpenAI
+from .ollama_llm import OllamaLLM
+from .gemini_llm import Gemini
+from .openai_vllm import OpenAIVLLM
+
+__all__ = [
+    'BaseLLM',
+    'Anthropic',
+    'OpenAI',
+    'OllamaLLM',
+    'Gemini',
+    'OpenAIVLLM',
+    'ImageMessage',
+]

{flo_ai-1.0.0.dev4 → flo_ai-1.0.0.dev6}/flo_ai/llm/openai_llm.py

@@ -28,11 +28,11 @@ class OpenAI(BaseLLM):
             kwargs['response_format'] = {'type': 'json_object'}
             kwargs['functions'] = [
                 {
-                    'name': output_schema.get('name', 'default'),
+                    'name': output_schema.get('title', 'default'),
                     'parameters': output_schema.get('schema', output_schema),
                 }
             ]
-            kwargs['function_call'] = {'name': output_schema.get('name', 'default')}
+            kwargs['function_call'] = {'name': output_schema.get('title', 'default')}
 
             # Add JSON format instruction to the system prompt
             if messages and messages[0]['role'] == 'system':

flo_ai-1.0.0.dev6/flo_ai/llm/openai_vllm.py

@@ -0,0 +1,64 @@
+from typing import Any
+from .openai_llm import OpenAI
+
+
+class OpenAIVLLM(OpenAI):
+    def __init__(
+        self,
+        base_url: str,
+        model: str,
+        api_key: str = None,
+        temperature: float = 0.7,
+        **kwargs,
+    ):
+        super().__init__(
+            model=model,
+            api_key=api_key,
+            temperature=temperature,
+            base_url=base_url,
+            **kwargs,
+        )
+
+    # overriden
+    async def generate(
+        self, messages: list[dict], output_schema: dict = None, **kwargs
+    ) -> Any:
+        # Convert output_schema to OpenAI format if provided
+        if output_schema:
+            kwargs['response_format'] = {
+                'type': 'json_schema',
+                'json_schema': {
+                    'name': output_schema.get('title', 'default'),
+                    'schema': output_schema.get('schema', output_schema),
+                },
+            }
+
+            # Add JSON format instruction to the system prompt
+            if messages and messages[0]['role'] == 'system':
+                messages[0]['content'] = (
+                    messages[0]['content']
+                    + '\n\nPlease provide your response in JSON format according to the specified schema.'
+                )
+            else:
+                messages.insert(
+                    0,
+                    {
+                        'role': 'system',
+                        'content': 'Please provide your response in JSON format according to the specified schema.',
+                    },
+                )
+
+        # Prepare OpenAI API parameters
+        vllm_openai_kwargs = {
+            'model': self.model,
+            'messages': messages,
+            **kwargs,
+            **self.kwargs,
+        }
+
+        # Make the API call
+        response = await self.client.chat.completions.create(**vllm_openai_kwargs)
+        message = response.choices[0].message
+
+        # Return the full message object instead of just the content
+        return message

{flo_ai-1.0.0.dev4 → flo_ai-1.0.0.dev6}/flo_ai/models/agent.py

@@ -106,7 +106,7 @@ class Agent(BaseAgent):
         """Run as a conversational agent when no tools are provided"""
         variables = variables or {}
 
-        while retry_count < self.max_retries:
+        while retry_count <= self.max_retries:
             try:
                 # Resolve variables in system prompt
                 system_content = (
@@ -150,7 +150,7 @@ class Agent(BaseAgent):
 
                 should_retry, analysis = await self.handle_error(e, context)
 
-                if should_retry and retry_count < self.max_retries:
+                if should_retry and retry_count <= self.max_retries:
                     self.add_to_history(
                         'system', f'Error occurred. Analysis: {analysis}'
                     )
@@ -167,7 +167,7 @@ class Agent(BaseAgent):
         """Run as a tool-using agent when tools are provided"""
         variables = variables or {}
 
-        while retry_count < self.max_retries:
+        while retry_count <= self.max_retries:
             try:
                 # Resolve variables in system prompt based on reasoning pattern
                 if self.reasoning_pattern == ReasoningPattern.REACT:
@@ -248,7 +248,7 @@ class Agent(BaseAgent):
                             'attempt': retry_count,
                         }
                         should_retry, analysis = await self.handle_error(e, context)
-                        if should_retry and retry_count < self.max_retries:
+                        if should_retry and retry_count <= self.max_retries:
                             self.add_to_history(
                                 'system', f'Tool execution error: {analysis}'
                             )
@@ -284,7 +284,7 @@ class Agent(BaseAgent):
                 }
 
                 should_retry, analysis = await self.handle_error(e, context)
-                if should_retry and retry_count < self.max_retries:
+                if should_retry and retry_count <= self.max_retries:
                     self.add_to_history(
                         'system', f'Error occurred. Analysis: {analysis}'
                     )

{flo_ai-1.0.0.dev4 → flo_ai-1.0.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flo_ai"
-version = "1.0.0-dev4"
+version = "1.0.0-dev6"
 description = "A easy way to create structured AI agents"
 authors = ["rootflo <*@rootflo.ai>"]
 license = "MIT"

flo_ai-1.0.0.dev4/flo_ai/llm/__init__.py

@@ -1,7 +0,0 @@
-from .base_llm import BaseLLM
-from .anthropic_llm import Anthropic
-from .openai_llm import OpenAI
-from .ollama_llm import OllamaLLM
-from .gemini_llm import Gemini
-
-__all__ = ['BaseLLM', 'Anthropic', 'OpenAI', 'OllamaLLM', 'Gemini']