tasks-prompts-chain 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

tasks_prompts_chain/tasks_prompts_chain.py

@@ -49,7 +49,7 @@ class ModelOptions(TypedDict, total=False):
 class PromptTemplate:
     def __init__(self, prompt: str, output_format: str = "TEXT", output_placeholder: Optional[str] = None):
         self.prompt = prompt
-        self.output_format = OutputFormat(output_format.upper())
+        self.output_format = OutputFormat(output_format.upper()).value
         self.output_placeholder = output_placeholder
 
 class TasksPromptsChain:
@@ -155,39 +155,62 @@ class TasksPromptsChain:
                 for placeholder, value in placeholder_values.items():
                     current_prompt = current_prompt.replace(f"{{{{{placeholder}}}}}", value)
 
+                wants_json_output = prompt_template.output_format == OutputFormat.JSON.value
                 # Format system message based on output format
                 format_instruction = ""
-                if prompt_template.output_format != OutputFormat.TEXT:
-                    format_instruction = f"\nPlease provide your response in {prompt_template.output_format.value} format."
+                if wants_json_output:
+                    format_instruction = f"\nPlease provide your response in {prompt_template.output_format}."                    
 
                 messages = []
                 if self.system_prompt and (i == 0 or self.system_apply_to_all_prompts):
                     messages.append({"role": "system", "content": self.system_prompt})
+                
                 messages.append({"role": "user", "content": current_prompt + format_instruction})
                 
-                stream = await self.client.chat.completions.create(
-                    model=self.model,
-                    messages=messages,
-                    temperature=self.temperature,
-                    max_tokens=self.max_tokens,
-                    stream=self.stream
-                )
+                # Default completition.create parameters
+                create_kwargs = {
+                    "model": self.model,
+                    "messages": messages,
+                    "temperature": self.temperature,
+                    "max_tokens": self.max_tokens,
+                    "stream": self.stream
+                }
+
+                # Check if used model is GPT 
+                is_gpt_model = self.model.lower().startswith("gpt")
+                # GPT model text = {"format" : {"type": "json_object"}}
+                if is_gpt_model and wants_json_output:
+                    create_kwargs["text"] = {
+                        "format": {
+                                "type": "json_object"
+                        }
+                    }
+
+                # Non Gpt model response_format={"type": "json_object|text"}
+                elif not is_gpt_model:
+                    create_kwargs["response_format"] = {
+                        "type": "json_object" if wants_json_output else "text"
+                    }
+
+                stream = await self.client.chat.completions.create(**create_kwargs)
                 
                 response_content = ""
                 self._current_stream_buffer = ""
                 
                 async for chunk in stream:
-                    if chunk.choices[0].delta.content is not None:
-                        delta = chunk.choices[0].delta.content
-                        response_content += delta
-                        self._current_stream_buffer = response_content
-                        self._format_current_stream()
-                        responses.append(response_content)
-                        # Store response with placeholder if specified
-                        if prompt_template.output_placeholder:
-                            placeholder_values[prompt_template.output_placeholder] = response_content
-                            self._results[prompt_template.output_placeholder] = response_content
-                        yield response_content                
+                    if not chunk.choices or not chunk.choices[0].delta or not chunk.choices[0].delta.content:
+                        continue
+
+                    delta = chunk.choices[0].delta.content
+                    response_content += delta
+                    self._current_stream_buffer = response_content
+                    self._format_current_stream()
+                    responses.append(response_content)
+                    # Store response with placeholder if specified
+                    if prompt_template.output_placeholder:
+                        placeholder_values[prompt_template.output_placeholder] = response_content
+                        self._results[prompt_template.output_placeholder] = response_content
+                    yield delta              
 
         except Exception as e:
             raise Exception(f"Error in prompt chain execution at prompt {i}: {str(e)}")

{tasks_prompts_chain-0.0.4.dist-info → tasks_prompts_chain-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasks_prompts_chain
-Version: 0.0.4
+Version: 0.0.6
 Summary: A Python library for creating and executing chains of prompts using OpenAI's SDK with streaming support and template formatting.
 Project-URL: Homepage, https://github.com/smirfolio/tasks_prompts_chain
 Project-URL: Issues, https://github.com/smirfolio/tasks_prompts_chain/issues
@@ -59,8 +59,13 @@ from tasks_prompts_chain import TasksPromptsChain
 async def main():
     # Initialize the chain
     chain = TasksPromptsChain(
-        model="gpt-3.5-turbo",
-        api_key="your-api-key",
+        model_options={
+            "model": "gpt-3.5-turbo",
+            "api_key": "your-api-key",
+            "temperature": 0.1,
+            "max_tokens": 4120,
+            "stream": True
+        },
         final_result_placeholder="design_result"
     )
 
@@ -93,8 +98,13 @@ async def main():
 
 ```python
 chain = TasksPromptsChain(
-    model="gpt-3.5-turbo",
-    api_key="your-api-key",
+    model_options={
+            "model": "gpt-3.5-turbo",
+            "api_key": "your-api-key",
+            "temperature": 0.1,
+            "max_tokens": 4120,
+            "stream": True
+        },
     final_result_placeholder="result",
     system_prompt="You are a professional design expert specialized in luxury products",
     system_apply_to_all_prompts=True
@@ -105,10 +115,15 @@ chain = TasksPromptsChain(
 
 ```python
 chain = TasksPromptsChain(
-    model="gpt-3.5-turbo",
-    api_key="your-api-key",
+    model_options={
+            "model": "your-custom-model",
+            "api_key": "your-api-key",
+            "base_url": "https://your-custom-endpoint.com/v1",
+            "temperature": 0.1,
+            "max_tokens": 4120,
+            "stream": True
+        },
     final_result_placeholder="result",
-    base_url="https://your-custom-endpoint.com/v1"
 )
 ```
 
@@ -195,6 +210,13 @@ Errors are raised with descriptive messages indicating the specific issue and pr
 4. Consider temperature settings based on your use case
 5. Use system prompts for consistent context
 
+## Compatible Models
+
+- Llama3.3
+- llama-4-scout
+- claude-3-7-sonnet-20250219 (Other claude version)
+- ChatGpt's
+
 ## License
 
 MIT License

tasks_prompts_chain-0.0.6.dist-info/RECORD

@@ -0,0 +1,6 @@
+tasks_prompts_chain/__init__.py,sha256=HVhC_vMTYCyZW6vnoErHh-TkAnNRqJ2JJqClJQSfU8Y,148
+tasks_prompts_chain/tasks_prompts_chain.py,sha256=DUKe5PseHKA9ownVXQpawcdAKGcwHvHtx1U_st2hT_8,10924
+tasks_prompts_chain-0.0.6.dist-info/METADATA,sha256=RNClygTof_WT8IryvMw4SeoVgWZeMYSKY5SlfLUwk4I,5892
+tasks_prompts_chain-0.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tasks_prompts_chain-0.0.6.dist-info/licenses/LICENSE,sha256=WYmcYJG1QFgu1hfo7qrEkZ3Jhcz8NUWe6XUraZvlIFs,10172
+tasks_prompts_chain-0.0.6.dist-info/RECORD,,

tasks_prompts_chain-0.0.4.dist-info/RECORD

@@ -1,6 +0,0 @@
-tasks_prompts_chain/__init__.py,sha256=HVhC_vMTYCyZW6vnoErHh-TkAnNRqJ2JJqClJQSfU8Y,148
-tasks_prompts_chain/tasks_prompts_chain.py,sha256=NwF9PmIHXbEzEusx7B5NTph3zgrJ-SuN74eCc2dRTPI,9986
-tasks_prompts_chain-0.0.4.dist-info/METADATA,sha256=pfN6RkU9RnR7fJm0i4_PnBKBGknzjd6URaXm0184HwA,5334
-tasks_prompts_chain-0.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tasks_prompts_chain-0.0.4.dist-info/licenses/LICENSE,sha256=WYmcYJG1QFgu1hfo7qrEkZ3Jhcz8NUWe6XUraZvlIFs,10172
-tasks_prompts_chain-0.0.4.dist-info/RECORD,,