flock-core 0.4.0b2__tar.gz → 0.4.0b4__tar.gz

{flock_core-0.4.0b2 → flock_core-0.4.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.0b2
+Version: 0.4.0b4
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE

{flock_core-0.4.0b2 → flock_core-0.4.0b4}/examples/01_introduction/08a_serialization.py

@@ -113,11 +113,11 @@ def serialization():
     flock.add_agent(person_agent)
 
     print(f"\nSerializing Flock to: file_path_demo.flock.yaml")
-    flock.to_yaml_file("file_path_demo.flock.yaml", path_type="relative")
+    flock.to_yaml_file("examples/01_introduction/data/file_path_demo.flock.yaml", path_type="relative")
 
     # Display the YAML content
     print("\nYAML Content:")
-    with open("file_path_demo.flock.yaml", "r") as f:
+    with open("examples/01_introduction/data/file_path_demo.flock.yaml", "r") as f:
         yaml_content = f.read()
         print(yaml_content)
 

{flock_core-0.4.0b2 → flock_core-0.4.0b4}/examples/01_introduction/08b_deserialization.py

@@ -25,7 +25,7 @@ def deserialization():
   
     try:
         # Attempt to load the Flock
-        loaded_flock = Flock.load_from_file("file_path_demo.flock.yaml")
+        loaded_flock = Flock.load_from_file("examples/01_introduction/data/file_path_demo.flock.yaml")
         
         # Test the loaded Flock
         print("\nTesting loaded Flock:")

{flock_core-0.4.0b2 → flock_core-0.4.0b4/examples/01_introduction/data}/file_path_demo.flock.yaml

@@ -136,27 +136,27 @@ components:
   DeclarativeEvaluator:
     type: flock_component
     module_path: flock.evaluators.declarative.declarative_evaluator
-    file_path: src\flock\evaluators\declarative\declarative_evaluator.py
+    file_path: src/flock/evaluators/declarative/declarative_evaluator.py
     description: Evaluator that uses DSPy for generation.
   OutputModule:
     type: flock_component
     module_path: flock.modules.output.output_module
-    file_path: src\flock\modules\output\output_module.py
+    file_path: src/flock/modules/output/output_module.py
     description: Module that handles output formatting and display.
   MetricsModule:
     type: flock_component
     module_path: flock.modules.performance.metrics_module
-    file_path: src\flock\modules\performance\metrics_module.py
+    file_path: src/flock/modules/performance/metrics_module.py
     description: Module for collecting and analyzing agent performance metrics.
   GreetingModule:
     type: flock_component
     module_path: __main__
-    file_path: examples\01_introduction\08_serialization.py
+    file_path: examples/01_introduction/08a_serialization.py
     description: A simple module that generates greetings.
   get_mobile_number:
     type: flock_callable
     module_path: __main__
-    file_path: examples\01_introduction\08_serialization.py
+    file_path: examples/01_introduction/08a_serialization.py
     description: A tool that returns a mobile number to a name.
 dependencies:
 - pydantic>=2.0.0

flock_core-0.4.0b2/bloggy.flock.yaml → flock_core-0.4.0b4/examples/02_concepts/data/own_tools.flock.yaml

@@ -1,12 +1,15 @@
-name: Example 01
+name: Own Tools Demo
 model: openai/gpt-4o
 enable_temporal: false
+enable_logging: false
+show_flock_banner: true
 agents:
-  bloggy:
-    name: bloggy
+  Menu Assistant:
+    name: Menu Assistant
     model: openai/gpt-4o
-    input: blog_idea
-    output: funny_blog_title, blog_headers
+    description: You are a helpful assistant
+    input: query
+    output: answer
     use_cache: true
     evaluator:
       name: default
@@ -22,7 +25,7 @@ agents:
         config:
           enabled: true
           theme: abernathy
-          render_table: false
+          render_table: true
           max_length: 1000
           wait_for_input: false
           write_to_file: false
@@ -49,24 +52,39 @@ agents:
           alert_on_high_latency: true
           latency_threshold_ms: 30000
         type: MetricsModule
+    tools:
+      - get_specials
+      - get_price
 components:
   DeclarativeEvaluator:
     type: flock_component
     module_path: flock.evaluators.declarative.declarative_evaluator
-    file_path: src\flock\evaluators\declarative\declarative_evaluator.py
+    file_path: src/flock/evaluators/declarative/declarative_evaluator.py
     description: Evaluator that uses DSPy for generation.
   OutputModule:
     type: flock_component
     module_path: flock.modules.output.output_module
-    file_path: src\flock\modules\output\output_module.py
+    file_path: src/flock/modules/output/output_module.py
     description: Module that handles output formatting and display.
   MetricsModule:
     type: flock_component
     module_path: flock.modules.performance.metrics_module
-    file_path: src\flock\modules\performance\metrics_module.py
+    file_path: src/flock/modules/performance/metrics_module.py
     description: Module for collecting and analyzing agent performance metrics.
+  get_specials:
+    type: flock_callable
+    module_path: tools.get_specials
+    file_path: examples/02_concepts/data/tools/tools.py
+    description: Provides a list of specials from the menu.
+  get_price:
+    type: flock_callable
+    module_path: tools.get_price
+    file_path: examples/02_concepts/data/tools/tools.py
+    description:
+      "Provides the price of the requested menu item.\n\nArgs:\n  item:\
+      \ The name of the menu item."
 dependencies:
-- pydantic>=2.0.0
-- flock>=0.3.41
+  - pydantic>=2.0.0
+  - flock>=0.3.41
 metadata:
   path_type: relative

flock_core-0.4.0b4/examples/02_concepts/data/tools/tools.py

@@ -0,0 +1,22 @@
+import random
+
+from flock.core.flock_registry import flock_tool
+
+
+@flock_tool
+def get_specials():
+  "Provides a list of specials from the menu."
+  return """
+        Special Soup: Clam Chowder
+        Special Salad: Cobb Salad
+        Special Drink: Chai Tea
+        """
+@flock_tool
+def get_price(item: str):
+  """Provides the price of the requested menu item.
+  
+  Args:
+    item: The name of the menu item.
+  """
+  # random price between 5 and 15
+  return f"${random.randint(5, 15)}"

{flock_core-0.4.0b2 → flock_core-0.4.0b4}/examples/02_concepts/tools/own_tools.py

@@ -21,7 +21,7 @@ def get_price(item: str):
   # random price between 5 and 15
   return f"${random.randint(5, 15)}"
 
-flock = Flock()
+flock = Flock(name="Own Tools Demo",enable_logging=True)
 
 agent = FlockFactory.create_default_agent(
   name="Menu Assistant",
@@ -32,6 +32,7 @@ agent = FlockFactory.create_default_agent(
 )
 flock.add_agent(agent)
 flock.run(agent, input={"query": "What is the price of the soup special?"})
+flock.to_yaml_file("examples/02_concepts/data/own_tools.flock.yaml", path_type="relative")
 
 
 

{flock_core-0.4.0b2 → flock_core-0.4.0b4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flock-core"
-version = "0.4.0b-2"
+version = "0.4.0b-4"
 description = "Declarative LLM Orchestration at Scale"
 readme = "README.md"
 authors = [

{flock_core-0.4.0b2 → flock_core-0.4.0b4}/src/flock/core/flock.py

@@ -617,16 +617,22 @@ class Flock(BaseModel, Serializable):
 
         # Look for type annotations (everything after ":")
         for part in signature_parts:
-            parts = part.split(":")
-            if len(parts) > 1:
-                type_part = parts[1].strip()
+            try:
+                parts = part.split(":")
+                if len(parts) > 1:
+                    type_part = parts[1].strip()
 
-            pydantic_models = extract_pydantic_models_from_type_string(
-                type_part
-            )
-            if pydantic_models:
-                for model in pydantic_models:
-                    custom_types.append(model.__name__)
+                pydantic_models = extract_pydantic_models_from_type_string(
+                    type_part
+                )
+                if pydantic_models:
+                    for model in pydantic_models:
+                        custom_types.append(model.__name__)
+            except Exception:
+                logger.warning(
+                    f"Could not extract types from signature '{signature}' (probably no type defined?)"
+                )
+                return []
 
             # # Extract from list[Type]
             # if "list[" in type_part:

{flock_core-0.4.0b2 → flock_core-0.4.0b4}/uv.lock

@@ -1245,7 +1245,7 @@ wheels = [
 
 [[package]]
 name = "flock-core"
-version = "0.4.0b2"
+version = "0.4.0b4"
 source = { editable = "." }
 dependencies = [
     { name = "azure-search-documents" },

flock_core-0.4.0b2/story_agent.flock.yaml

@@ -1,310 +0,0 @@
-model: gemini/gemini-2.5-pro-exp-03-25
-enable_temporal: false
-agents:
-  story_agent:
-    name: story_agent
-    model: gemini/gemini-2.5-pro-exp-03-25
-    description: An agent that is a master storyteller
-    input: 'story_idea: str'
-    output: 'story: Story, story_bible: StoryBible'
-    use_cache: true
-    evaluator:
-      name: default
-      config:
-        model: gemini/gemini-2.5-pro-exp-03-25
-        use_cache: true
-        temperature: 0.0
-        max_tokens: 60000
-      type: DeclarativeEvaluator
-    modules:
-      output:
-        name: output
-        config:
-          enabled: true
-          theme: abernathy
-          render_table: false
-          max_length: 1000
-          wait_for_input: false
-          write_to_file: true
-          output_dir: output/
-          truncate_long_values: true
-          show_metadata: true
-          format_code_blocks: true
-          custom_formatters: {}
-          no_output: false
-          print_context: false
-        type: OutputModule
-      metrics:
-        name: metrics
-        config:
-          enabled: true
-          collect_timing: true
-          collect_memory: true
-          collect_token_usage: true
-          collect_cpu: true
-          storage_type: json
-          metrics_dir: metrics/
-          aggregation_interval: 1h
-          retention_days: 30
-          alert_on_high_latency: true
-          latency_threshold_ms: 30000
-        type: MetricsModule
-types:
-  Story:
-    module_path: __main__
-    type: pydantic.BaseModel
-    schema:
-      $defs:
-        Chapter:
-          properties:
-            title:
-              description: Title of the chapter
-              title: Title
-              type: string
-            chapter_number:
-              description: Chapter number of the chapter
-              title: Chapter Number
-              type: integer
-            purpose:
-              description: Purpose of the chapter
-              title: Purpose
-              type: string
-            summary:
-              description: Key events or chapter summary
-              title: Summary
-              type: string
-            scenes:
-              description: Scenes of the chapter
-              items:
-                $ref: '#/$defs/Scene'
-              title: Scenes
-              type: array
-          required:
-          - title
-          - chapter_number
-          - purpose
-          - summary
-          - scenes
-          title: Chapter
-          type: object
-        Character:
-          properties:
-            name:
-              description: Name of the character
-              title: Name
-              type: string
-            role:
-              description: Role of the character
-              title: Role
-              type: string
-            age:
-              description: Age of the character
-              title: Age
-              type: string
-            appearance:
-              description: Appearance of the character
-              title: Appearance
-              type: string
-            image_prompt:
-              description: Very detailed image prompt for image generation to represent
-                the character
-              title: Image Prompt
-              type: string
-            personality_traits:
-              description: Personality traits of the character
-              items:
-                type: string
-              title: Personality Traits
-              type: array
-            backstory:
-              description: Backstory of the character
-              title: Backstory
-              type: string
-            motivations:
-              description: Motivations of the character
-              title: Motivations
-              type: string
-            weaknesses:
-              description: Weaknesses of the character
-              title: Weaknesses
-              type: string
-            character_arc:
-              description: How the character evolves throughout the story
-              title: Character Arc
-              type: string
-          required:
-          - name
-          - role
-          - age
-          - appearance
-          - image_prompt
-          - personality_traits
-          - backstory
-          - motivations
-          - weaknesses
-          - character_arc
-          title: Character
-          type: object
-        Scene:
-          properties:
-            title:
-              title: Title
-              type: string
-            setting:
-              description: Setting of the scene
-              title: Setting
-              type: string
-            goal:
-              description: Goal of the scene
-              title: Goal
-              type: string
-            conflict:
-              description: Conflict of the scene
-              title: Conflict
-              type: string
-            outcome:
-              description: Outcome of the scene
-              title: Outcome
-              type: string
-            characters_involved:
-              description: Name of characters/entities involved in the scene
-              items:
-                type: string
-              title: Characters Involved
-              type: array
-            story_beats:
-              description: Story beats of the scene
-              items:
-                type: string
-              title: Story Beats
-              type: array
-          required:
-          - title
-          - setting
-          - goal
-          - conflict
-          - outcome
-          - characters_involved
-          - story_beats
-          title: Scene
-          type: object
-      properties:
-        title:
-          title: Title
-          type: string
-        status:
-          default: Idea
-          description: Idea, Drafting, Revising, Completed
-          title: Status
-          type: string
-        genre:
-          description: Genre(s) of the story
-          items:
-            type: string
-          title: Genre
-          type: array
-        tone:
-          description: Tone of the story
-          title: Tone
-          type: string
-        themes:
-          description: Themes of the story
-          items:
-            type: string
-          title: Themes
-          type: array
-        central_conflict:
-          description: Central conflict of the story
-          title: Central Conflict
-          type: string
-        brief_summary:
-          description: Brief summary of the story
-          title: Brief Summary
-          type: string
-        long_summary:
-          description: Long-form summary of the story.
-          title: Long Summary
-          type: string
-        characters:
-          description: Important characters and/or entities of the story
-          items:
-            $ref: '#/$defs/Character'
-          title: Characters
-          type: array
-        chapters:
-          description: All chapters of the story. At least one chapter per act.
-          items:
-            $ref: '#/$defs/Chapter'
-          title: Chapters
-          type: array
-      required:
-      - title
-      - genre
-      - tone
-      - themes
-      - central_conflict
-      - brief_summary
-      - long_summary
-      - characters
-      - chapters
-      type: object
-    imports:
-    - from __main__ import Story
-  StoryBible:
-    module_path: __main__
-    type: pydantic.BaseModel
-    schema:
-      properties:
-        timeline:
-          additionalProperties:
-            type: string
-          description: Timeline of the story
-          title: Timeline
-          type: object
-        worldbuilding_notes:
-          additionalProperties:
-            type: string
-          description: Worldbuilding notes of the story
-          title: Worldbuilding Notes
-          type: object
-        consistency_rules:
-          description: Consistency rules of the story
-          items:
-            type: string
-          title: Consistency Rules
-          type: array
-        writing_reference:
-          anyOf:
-          - type: string
-          - type: 'null'
-          default: null
-          description: Writing reference and/or style guidelines
-          title: Writing Reference
-      required:
-      - timeline
-      - worldbuilding_notes
-      - consistency_rules
-      type: object
-    imports:
-    - from __main__ import StoryBible
-components:
-  DeclarativeEvaluator:
-    type: flock_component
-    module_path: flock.evaluators.declarative.declarative_evaluator
-    file_path: src\flock\evaluators\declarative\declarative_evaluator.py
-    description: Evaluator that uses DSPy for generation.
-  OutputModule:
-    type: flock_component
-    module_path: flock.modules.output.output_module
-    file_path: src\flock\modules\output\output_module.py
-    description: Module that handles output formatting and display.
-  MetricsModule:
-    type: flock_component
-    module_path: flock.modules.performance.metrics_module
-    file_path: src\flock\modules\performance\metrics_module.py
-    description: Module for collecting and analyzing agent performance metrics.
-dependencies:
-- pydantic>=2.0.0
-- flock>=0.3.41
-metadata:
-  path_type: relative