markdown-flow 0.2.19__tar.gz → 0.2.30__tar.gz

{markdown_flow-0.2.19 → markdown_flow-0.2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.2.19
+Version: 0.2.30
 Summary: An agent library designed to parse and process MarkdownFlow documents
 Project-URL: Homepage, https://github.com/ai-shifu/markdown-flow-agent-py
 Project-URL: Bug Tracker, https://github.com/ai-shifu/markdown-flow-agent-py/issues
@@ -73,7 +73,7 @@ llm_provider = YourLLMProvider(api_key="your-key")
 mf = MarkdownFlow(document, llm_provider=llm_provider)
 
 # Process with different modes
-result = await mf.process(
+result = mf.process(
     block_index=0,
     mode=ProcessMode.COMPLETE,
     variables={'name': 'Alice', 'level': 'Intermediate'}
@@ -84,7 +84,7 @@ result = await mf.process(
 
 ```python
 # Stream processing for real-time responses
-async for chunk in mf.process(
+for chunk in mf.process(
     block_index=0,
     mode=ProcessMode.STREAM,
     variables={'name': 'Bob'}
@@ -122,7 +122,7 @@ user_input = {
     'skills': ['Python', 'JavaScript', 'Go']  # Multi-selection
 }
 
-result = await mf.process(
+result = mf.process(
     block_index=1,  # Process skills interaction
     user_input=user_input,
     mode=ProcessMode.COMPLETE
@@ -148,13 +148,13 @@ class MarkdownFlow:
     def get_all_blocks(self) -> List[Block]: ...
     def extract_variables(self) -> Set[str]: ...
 
-    async def process(
+    def process(
         self,
         block_index: int,
         mode: ProcessMode = ProcessMode.COMPLETE,
         variables: Optional[Dict[str, str]] = None,
         user_input: Optional[str] = None
-    ) -> LLMResult: ...
+    ) -> LLMResult | Generator[LLMResult, None, None]: ...
 ```
 
 **Methods:**
@@ -184,24 +184,19 @@ Processing mode enumeration for different use cases.
 
 ```python
 class ProcessMode(Enum):
-    PROMPT_ONLY = "prompt_only"  # Generate prompts without LLM calls
-    COMPLETE = "complete"        # Non-streaming LLM processing
-    STREAM = "stream"           # Streaming LLM responses
+    COMPLETE = "complete"  # Non-streaming LLM processing
+    STREAM = "stream"      # Streaming LLM responses
 ```
 
 **Usage:**
 
 ```python
-# Generate prompt only
-prompt_result = await mf.process(0, ProcessMode.PROMPT_ONLY)
-print(prompt_result.content)  # Raw prompt text
-
 # Complete response
-complete_result = await mf.process(0, ProcessMode.COMPLETE)
+complete_result = mf.process(0, ProcessMode.COMPLETE)
 print(complete_result.content)  # Full LLM response
 
 # Streaming response
-async for chunk in mf.process(0, ProcessMode.STREAM):
+for chunk in mf.process(0, ProcessMode.STREAM):
     print(chunk.content, end='')
 ```
 
@@ -211,14 +206,14 @@ Abstract base class for implementing LLM providers.
 
 ```python
 from abc import ABC, abstractmethod
-from typing import AsyncGenerator
+from typing import Generator
 
 class LLMProvider(ABC):
     @abstractmethod
-    async def complete(self, prompt: str) -> LLMResult: ...
+    def complete(self, messages: list[dict[str, str]]) -> str: ...
 
     @abstractmethod
-    async def stream(self, prompt: str) -> AsyncGenerator[str, None]: ...
+    def stream(self, messages: list[dict[str, str]]) -> Generator[str, None, None]: ...
 ```
 
 **Custom Implementation:**
@@ -226,25 +221,24 @@ class LLMProvider(ABC):
 ```python
 class OpenAIProvider(LLMProvider):
     def __init__(self, api_key: str):
-        self.client = openai.AsyncOpenAI(api_key=api_key)
+        self.client = openai.OpenAI(api_key=api_key)
 
-    async def complete(self, prompt: str) -> LLMResult:
-        response = await self.client.completions.create(
+    def complete(self, messages: list[dict[str, str]]) -> str:
+        response = self.client.chat.completions.create(
             model="gpt-3.5-turbo",
-            prompt=prompt,
-            max_tokens=500
+            messages=messages
         )
-        return LLMResult(content=response.choices[0].text.strip())
+        return response.choices[0].message.content
 
-    async def stream(self, prompt: str):
-        stream = await self.client.completions.create(
+    def stream(self, messages: list[dict[str, str]]):
+        stream = self.client.chat.completions.create(
             model="gpt-3.5-turbo",
-            prompt=prompt,
+            messages=messages,
             stream=True
         )
-        async for chunk in stream:
-            if chunk.choices[0].text:
-                yield chunk.choices[0].text
+        for chunk in stream:
+            if chunk.choices[0].delta.content:
+                yield chunk.choices[0].delta.content
 ```
 
 ### Block Types
@@ -402,7 +396,7 @@ The new version introduces multi-select interaction support with improvements to
 user_input = "Python"
 
 # Process interaction
-result = await mf.process(
+result = mf.process(
     block_index=1,
     user_input=user_input,
     mode=ProcessMode.COMPLETE
@@ -419,7 +413,7 @@ user_input = {
 }
 
 # Process interaction
-result = await mf.process(
+result = mf.process(
     block_index=1,
     user_input=user_input,
     mode=ProcessMode.COMPLETE
@@ -462,10 +456,10 @@ class CustomAPIProvider(LLMProvider):
     def __init__(self, base_url: str, api_key: str):
         self.base_url = base_url
         self.api_key = api_key
-        self.client = httpx.AsyncClient()
+        self.client = httpx.Client()
 
-    async def complete(self, prompt: str) -> LLMResult:
-        response = await self.client.post(
+    def complete(self, prompt: str) -> LLMResult:
+        response = self.client.post(
             f"{self.base_url}/complete",
             headers={"Authorization": f"Bearer {self.api_key}"},
             json={"prompt": prompt, "max_tokens": 1000}
@@ -473,14 +467,14 @@ class CustomAPIProvider(LLMProvider):
         data = response.json()
         return LLMResult(content=data["text"])
 
-    async def stream(self, prompt: str):
-        async with self.client.stream(
+    def stream(self, prompt: str):
+        with self.client.stream(
             "POST",
             f"{self.base_url}/stream",
             headers={"Authorization": f"Bearer {self.api_key}"},
             json={"prompt": prompt}
         ) as response:
-            async for chunk in response.aiter_text():
+            for chunk in response.iter_text():
                 if chunk.strip():
                     yield chunk
 
@@ -492,7 +486,7 @@ mf = MarkdownFlow(document, llm_provider=provider)
 ### Multi-Block Document Processing
 
 ```python
-async def process_conversation():
+def process_conversation():
     conversation = """
 # AI Assistant
 
@@ -529,7 +523,7 @@ Would you like to start with the basics?
     for i, block in enumerate(blocks):
         if block.block_type == BlockType.CONTENT:
             print(f"\n--- Processing Block {i} ---")
-            result = await mf.process(
+            result = mf.process(
                 block_index=i,
                 mode=ProcessMode.COMPLETE,
                 variables=variables
@@ -544,9 +538,8 @@ Would you like to start with the basics?
 
 ```python
 from markdown_flow import MarkdownFlow, ProcessMode
-import asyncio
 
-async def stream_with_progress():
+def stream_with_progress():
     document = """
 Generate a comprehensive Python tutorial for {{user_name}}
 focusing on {{topic}} with practical examples.
@@ -560,12 +553,12 @@ Include code samples, explanations, and practice exercises.
     content = ""
     chunk_count = 0
 
-    async for chunk in mf.process(
+    for chunk in mf.process(
         block_index=0,
         mode=ProcessMode.STREAM,
         variables={
             'user_name': 'developer',
-            'topic': 'async programming'
+            'topic': 'synchronous programming'
         }
     ):
         content += chunk.content
@@ -599,13 +592,13 @@ class InteractiveDocumentBuilder:
         self.user_responses = {}
         self.current_block = 0
 
-    async def start_interaction(self):
+    def start_interaction(self):
         blocks = self.mf.get_all_blocks()
 
         for i, block in enumerate(blocks):
             if block.block_type == BlockType.CONTENT:
                 # Process content block with current variables
-                result = await self.mf.process(
+                result = self.mf.process(
                     block_index=i,
                     mode=ProcessMode.COMPLETE,
                     variables=self.user_responses
@@ -614,14 +607,14 @@ class InteractiveDocumentBuilder:
 
             elif block.block_type == BlockType.INTERACTION:
                 # Handle user interaction
-                response = await self.handle_interaction(block.content)
+                response = self.handle_interaction(block.content)
                 if response:
                     self.user_responses.update(response)
 
-    async def handle_interaction(self, interaction_content: str):
-        from markdown_flow.utils import InteractionParser
+    def handle_interaction(self, interaction_content: str):
+        from markdown_flow.parser import InteractionParser
 
-        interaction = InteractionParser.parse(interaction_content)
+        interaction = InteractionParser().parse(interaction_content)
         print(f"\n{interaction_content}")
 
         if interaction.name == "BUTTONS_ONLY":
@@ -635,7 +628,7 @@ class InteractiveDocumentBuilder:
                 return {interaction.variable: selected}
             except (ValueError, IndexError):
                 print("Invalid choice")
-                return await self.handle_interaction(interaction_content)
+                return self.handle_interaction(interaction_content)
 
         elif interaction.name == "TEXT_ONLY":
             response = input(f"{interaction.question}: ")
@@ -657,7 +650,7 @@ Great choice, {{name}}! {{subject}} is an excellent field to study.
 """
 
 builder = InteractiveDocumentBuilder(template, your_llm_provider)
-await builder.start_interaction()
+builder.start_interaction()
 ```
 
 ### Variable System Deep Dive

{markdown_flow-0.2.19 → markdown_flow-0.2.30}/README.md

@@ -55,7 +55,7 @@ llm_provider = YourLLMProvider(api_key="your-key")
 mf = MarkdownFlow(document, llm_provider=llm_provider)
 
 # Process with different modes
-result = await mf.process(
+result = mf.process(
     block_index=0,
     mode=ProcessMode.COMPLETE,
     variables={'name': 'Alice', 'level': 'Intermediate'}
@@ -66,7 +66,7 @@ result = await mf.process(
 
 ```python
 # Stream processing for real-time responses
-async for chunk in mf.process(
+for chunk in mf.process(
     block_index=0,
     mode=ProcessMode.STREAM,
     variables={'name': 'Bob'}
@@ -104,7 +104,7 @@ user_input = {
     'skills': ['Python', 'JavaScript', 'Go']  # Multi-selection
 }
 
-result = await mf.process(
+result = mf.process(
     block_index=1,  # Process skills interaction
     user_input=user_input,
     mode=ProcessMode.COMPLETE
@@ -130,13 +130,13 @@ class MarkdownFlow:
     def get_all_blocks(self) -> List[Block]: ...
     def extract_variables(self) -> Set[str]: ...
 
-    async def process(
+    def process(
         self,
         block_index: int,
         mode: ProcessMode = ProcessMode.COMPLETE,
         variables: Optional[Dict[str, str]] = None,
         user_input: Optional[str] = None
-    ) -> LLMResult: ...
+    ) -> LLMResult | Generator[LLMResult, None, None]: ...
 ```
 
 **Methods:**
@@ -166,24 +166,19 @@ Processing mode enumeration for different use cases.
 
 ```python
 class ProcessMode(Enum):
-    PROMPT_ONLY = "prompt_only"  # Generate prompts without LLM calls
-    COMPLETE = "complete"        # Non-streaming LLM processing
-    STREAM = "stream"           # Streaming LLM responses
+    COMPLETE = "complete"  # Non-streaming LLM processing
+    STREAM = "stream"      # Streaming LLM responses
 ```
 
 **Usage:**
 
 ```python
-# Generate prompt only
-prompt_result = await mf.process(0, ProcessMode.PROMPT_ONLY)
-print(prompt_result.content)  # Raw prompt text
-
 # Complete response
-complete_result = await mf.process(0, ProcessMode.COMPLETE)
+complete_result = mf.process(0, ProcessMode.COMPLETE)
 print(complete_result.content)  # Full LLM response
 
 # Streaming response
-async for chunk in mf.process(0, ProcessMode.STREAM):
+for chunk in mf.process(0, ProcessMode.STREAM):
     print(chunk.content, end='')
 ```
 
@@ -193,14 +188,14 @@ Abstract base class for implementing LLM providers.
 
 ```python
 from abc import ABC, abstractmethod
-from typing import AsyncGenerator
+from typing import Generator
 
 class LLMProvider(ABC):
     @abstractmethod
-    async def complete(self, prompt: str) -> LLMResult: ...
+    def complete(self, messages: list[dict[str, str]]) -> str: ...
 
     @abstractmethod
-    async def stream(self, prompt: str) -> AsyncGenerator[str, None]: ...
+    def stream(self, messages: list[dict[str, str]]) -> Generator[str, None, None]: ...
 ```
 
 **Custom Implementation:**
@@ -208,25 +203,24 @@ class LLMProvider(ABC):
 ```python
 class OpenAIProvider(LLMProvider):
     def __init__(self, api_key: str):
-        self.client = openai.AsyncOpenAI(api_key=api_key)
+        self.client = openai.OpenAI(api_key=api_key)
 
-    async def complete(self, prompt: str) -> LLMResult:
-        response = await self.client.completions.create(
+    def complete(self, messages: list[dict[str, str]]) -> str:
+        response = self.client.chat.completions.create(
             model="gpt-3.5-turbo",
-            prompt=prompt,
-            max_tokens=500
+            messages=messages
         )
-        return LLMResult(content=response.choices[0].text.strip())
+        return response.choices[0].message.content
 
-    async def stream(self, prompt: str):
-        stream = await self.client.completions.create(
+    def stream(self, messages: list[dict[str, str]]):
+        stream = self.client.chat.completions.create(
             model="gpt-3.5-turbo",
-            prompt=prompt,
+            messages=messages,
             stream=True
         )
-        async for chunk in stream:
-            if chunk.choices[0].text:
-                yield chunk.choices[0].text
+        for chunk in stream:
+            if chunk.choices[0].delta.content:
+                yield chunk.choices[0].delta.content
 ```
 
 ### Block Types
@@ -384,7 +378,7 @@ The new version introduces multi-select interaction support with improvements to
 user_input = "Python"
 
 # Process interaction
-result = await mf.process(
+result = mf.process(
     block_index=1,
     user_input=user_input,
     mode=ProcessMode.COMPLETE
@@ -401,7 +395,7 @@ user_input = {
 }
 
 # Process interaction
-result = await mf.process(
+result = mf.process(
     block_index=1,
     user_input=user_input,
     mode=ProcessMode.COMPLETE
@@ -444,10 +438,10 @@ class CustomAPIProvider(LLMProvider):
     def __init__(self, base_url: str, api_key: str):
         self.base_url = base_url
         self.api_key = api_key
-        self.client = httpx.AsyncClient()
+        self.client = httpx.Client()
 
-    async def complete(self, prompt: str) -> LLMResult:
-        response = await self.client.post(
+    def complete(self, prompt: str) -> LLMResult:
+        response = self.client.post(
             f"{self.base_url}/complete",
             headers={"Authorization": f"Bearer {self.api_key}"},
             json={"prompt": prompt, "max_tokens": 1000}
@@ -455,14 +449,14 @@ class CustomAPIProvider(LLMProvider):
         data = response.json()
         return LLMResult(content=data["text"])
 
-    async def stream(self, prompt: str):
-        async with self.client.stream(
+    def stream(self, prompt: str):
+        with self.client.stream(
             "POST",
             f"{self.base_url}/stream",
             headers={"Authorization": f"Bearer {self.api_key}"},
             json={"prompt": prompt}
         ) as response:
-            async for chunk in response.aiter_text():
+            for chunk in response.iter_text():
                 if chunk.strip():
                     yield chunk
 
@@ -474,7 +468,7 @@ mf = MarkdownFlow(document, llm_provider=provider)
 ### Multi-Block Document Processing
 
 ```python
-async def process_conversation():
+def process_conversation():
     conversation = """
 # AI Assistant
 
@@ -511,7 +505,7 @@ Would you like to start with the basics?
     for i, block in enumerate(blocks):
         if block.block_type == BlockType.CONTENT:
             print(f"\n--- Processing Block {i} ---")
-            result = await mf.process(
+            result = mf.process(
                 block_index=i,
                 mode=ProcessMode.COMPLETE,
                 variables=variables
@@ -526,9 +520,8 @@ Would you like to start with the basics?
 
 ```python
 from markdown_flow import MarkdownFlow, ProcessMode
-import asyncio
 
-async def stream_with_progress():
+def stream_with_progress():
     document = """
 Generate a comprehensive Python tutorial for {{user_name}}
 focusing on {{topic}} with practical examples.
@@ -542,12 +535,12 @@ Include code samples, explanations, and practice exercises.
     content = ""
     chunk_count = 0
 
-    async for chunk in mf.process(
+    for chunk in mf.process(
         block_index=0,
         mode=ProcessMode.STREAM,
         variables={
             'user_name': 'developer',
-            'topic': 'async programming'
+            'topic': 'synchronous programming'
         }
     ):
         content += chunk.content
@@ -581,13 +574,13 @@ class InteractiveDocumentBuilder:
         self.user_responses = {}
         self.current_block = 0
 
-    async def start_interaction(self):
+    def start_interaction(self):
         blocks = self.mf.get_all_blocks()
 
         for i, block in enumerate(blocks):
             if block.block_type == BlockType.CONTENT:
                 # Process content block with current variables
-                result = await self.mf.process(
+                result = self.mf.process(
                     block_index=i,
                     mode=ProcessMode.COMPLETE,
                     variables=self.user_responses
@@ -596,14 +589,14 @@ class InteractiveDocumentBuilder:
 
             elif block.block_type == BlockType.INTERACTION:
                 # Handle user interaction
-                response = await self.handle_interaction(block.content)
+                response = self.handle_interaction(block.content)
                 if response:
                     self.user_responses.update(response)
 
-    async def handle_interaction(self, interaction_content: str):
-        from markdown_flow.utils import InteractionParser
+    def handle_interaction(self, interaction_content: str):
+        from markdown_flow.parser import InteractionParser
 
-        interaction = InteractionParser.parse(interaction_content)
+        interaction = InteractionParser().parse(interaction_content)
         print(f"\n{interaction_content}")
 
         if interaction.name == "BUTTONS_ONLY":
@@ -617,7 +610,7 @@ class InteractiveDocumentBuilder:
                 return {interaction.variable: selected}
             except (ValueError, IndexError):
                 print("Invalid choice")
-                return await self.handle_interaction(interaction_content)
+                return self.handle_interaction(interaction_content)
 
         elif interaction.name == "TEXT_ONLY":
             response = input(f"{interaction.question}: ")
@@ -639,7 +632,7 @@ Great choice, {{name}}! {{subject}} is an excellent field to study.
 """
 
 builder = InteractiveDocumentBuilder(template, your_llm_provider)
-await builder.start_interaction()
+builder.start_interaction()
 ```
 
 ### Variable System Deep Dive

{markdown_flow-0.2.19 → markdown_flow-0.2.30}/markdown_flow/__init__.py

@@ -9,7 +9,7 @@ Core Features:
     - Extract variable placeholders ({{variable}} and %{{variable}} formats)
     - Build LLM-ready prompts and message formats
     - Handle user interaction validation and input processing
-    - Support multiple processing modes: PROMPT_ONLY, COMPLETE, STREAM
+    - Support multiple processing modes: COMPLETE, STREAM
 
 Supported Interaction Types:
     - TEXT_ONLY: ?[%{{var}}...question] - Text input only
@@ -35,7 +35,6 @@ Basic Usage:
     result = mf.process(0, variables={'name': 'John'}, mode=ProcessMode.COMPLETE)
 
     # Different processing modes
-    prompt_result = mf.process(0, mode=ProcessMode.PROMPT_ONLY)
     complete_result = mf.process(0, mode=ProcessMode.COMPLETE)
     stream_result = mf.process(0, mode=ProcessMode.STREAM)
 
@@ -53,7 +52,7 @@ Import Guide:
 from .core import MarkdownFlow
 from .enums import BlockType, InputType
 from .llm import LLMProvider, LLMResult, ProcessMode
-from .utils import (
+from .parser import (
     InteractionParser,
     InteractionType,
     extract_interaction_question,
@@ -83,4 +82,5 @@ __all__ = [
     "replace_variables_in_text",
 ]
 
-__version__ = "0.2.19"
+__version__ = "0.2.30"
+# __version__ = "0.2.29-alpha-1"