flock-core 0.4.0b32__py3-none-any.whl → 0.4.0b34__py3-none-any.whl

flock/core/flock_agent.py

@@ -231,13 +231,17 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
                 agent=self.name,
             )
             try:
+                current_result = result
                 for module in self.get_enabled_modules():
-                    await module.on_terminate(
-                        self, inputs, self.context, result
+                    tmp_result = await module.on_terminate(
+                        self, inputs, self.context, current_result
                     )
+                    # If the module returns a result, use it
+                    if tmp_result:
+                        current_result = tmp_result
 
                 if self.write_to_file:
-                    self._save_output(self.name, result)
+                    self._save_output(self.name, current_result)
 
                 if self.wait_for_input:
                     # simple input prompt
@@ -318,12 +322,15 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
             # Post-evaluate hooks
             current_result = result
             for module in self.get_enabled_modules():
-                current_result = await module.on_post_evaluate(
+                tmp_result = await module.on_post_evaluate(
                     self,
                     current_inputs,
                     self.context,
                     current_result,
                 )
+                # If the module returns a result, use it
+                if tmp_result:
+                    current_result = tmp_result
 
             logger.debug(f"Evaluation completed for agent '{self.name}'")
             return current_result

flock/core/flock_module.py

@@ -76,7 +76,7 @@ class FlockModule(BaseModel, ABC):
         inputs: dict[str, Any],
         context: FlockContext | None = None,
         result: dict[str, Any] | None = None,
-    ) -> dict[str, Any]:
+    ) -> dict[str, Any] | None:
         """Called after agent evaluation, can modify results."""
         return result
 
@@ -86,9 +86,9 @@ class FlockModule(BaseModel, ABC):
         inputs: dict[str, Any],
         context: FlockContext | None = None,
         result: dict[str, Any] | None = None,
-    ) -> None:
+    ) -> dict[str, Any] | None:
         """Called when the agent finishes running."""
-        pass
+        return result
 
     async def on_error(
         self,

flock/core/util/cli_helper.py

@@ -62,9 +62,9 @@ def init_console(clear_screen: bool = True, show_banner: bool = True):
 
     if show_banner:
         console.print(banner_text)
-    console.print(
-        "[italic]'Magpie'[/] milestone - [bold]white duck GmbH[/] - [cyan]https://whiteduck.de[/]\n"
-    )
+        console.print(
+            "[italic]'Magpie'[/] milestone - [bold]white duck GmbH[/] - [cyan]https://whiteduck.de[/]\n"
+        )
 
 
 def display_banner_no_version():

flock/core/util/spliter.py

@@ -2,46 +2,37 @@ import re
 
 
 def split_top_level(spec: str) -> list[str]:
-    """Split *spec* on commas that are truly between fields (i.e. that
-    are **not** inside brackets, braces, parentheses, string literals,
-    or the free-form description).
-
-    Strategy
-    --------
-    1. Single pass, char-by-char.
-    2. Track    • nesting depth for (), [], {}
-                • whether we are inside a quoted string
-    3. Consider a comma a separator *only* if depth == 0, we are not
-       inside quotes **and** the text that follows matches
-       `optional-ws + identifier + optional-ws + ':'`
-       which can only be the start of the next field.
-    """
+    """Return raw field strings, split on *top-level* commas."""
     fields: list[str] = []
     start = 0
     depth = 0
     quote_char: str | None = None
     i = 0
-    ident_re = re.compile(r"[A-Za-z_]\w*")  # cheap Python identifier
+    ident_re = re.compile(r"[A-Za-z_]\w*")  # cheap identifier
 
     while i < len(spec):
         ch = spec[i]
 
-        # ---------------- string handling ----------------
+        # ---------- string handling ----------
         if quote_char:
+            if ch == "\\":
+                i += 2  # skip escaped char
+                continue
             if ch == quote_char:
                 quote_char = None
             i += 1
             continue
 
         if ch in {"'", '"'}:
-            # treat as string delimiter only in places regular Python would
             prev = spec[i - 1] if i else " "
-            if depth or prev.isspace() or prev in "=([{,:":  # likely a quote
+            if (
+                depth or prev.isspace() or prev in "=([{,:"
+            ):  # looks like a quote
                 quote_char = ch
             i += 1
             continue
 
-        # ---------------- bracket / brace / paren ----------------
+        # ---------- bracket / brace / paren ----------
         if ch in "([{":
             depth += 1
             i += 1
@@ -51,23 +42,28 @@ def split_top_level(spec: str) -> list[str]:
             i += 1
             continue
 
-        # ---------------- field separators ----------------
+        # ---------- field separators ----------
         if ch == "," and depth == 0:
             j = i + 1
             while j < len(spec) and spec[j].isspace():
                 j += 1
-            if j < len(spec):
-                id_match = ident_re.match(spec, j)
-                if id_match:
-                    k = id_match.end()
-                    while k < len(spec) and spec[k].isspace():
-                        k += 1
-                    if k < len(spec) and spec[k] == ":":
-                        # confirmed: the comma ends the current field
-                        fields.append(spec[start:i].strip())
-                        start = i + 1
-                        i += 1
-                        continue
+            if j >= len(spec):  # comma at end – split
+                fields.append(spec[start:i].strip())
+                start = i + 1
+                i += 1
+                continue
+
+            id_match = ident_re.match(spec, j)
+            if id_match:
+                k = id_match.end()
+                while k < len(spec) and spec[k].isspace():
+                    k += 1
+                if k >= len(spec) or spec[k] in {":", "|", ","}:
+                    # confirmed: comma separates two fields
+                    fields.append(spec[start:i].strip())
+                    start = i + 1
+                    i += 1
+                    continue
 
         i += 1
 
@@ -76,21 +72,29 @@ def split_top_level(spec: str) -> list[str]:
 
 
 def parse_schema(spec: str) -> list[tuple[str, str, str]]:
-    """Turn the raw *spec* into List[(name, python_type, description)]."""
+    """Turn *spec* into a list of (name, python_type, description)."""
     result: list[tuple[str, str, str]] = []
 
     for field in split_top_level(spec):
-        if ":" not in field:
-            raise ValueError(f"Malformed field (missing ':'): {field!r}")
+        name = ""
+        type_str = "str"  # default type
+        description = ""
 
-        name_part, rest = field.split(":", 1)
-        name = name_part.strip()
-
-        type_part, _, desc_part = rest.partition("|")
-        type_str = type_part.strip()
+        name_part, _, desc_part = field.partition("|")
         description = desc_part.strip()
+        main_part = name_part.strip()
+
+        if ":" in main_part:
+            name, type_candidate = main_part.split(":", 1)
+            name = name.strip()
+            type_candidate = type_candidate.strip()
+            if type_candidate:
+                type_str = type_candidate
+        else:
+            name = main_part  # keeps default type
 
-        result.append((name, type_str, description))
+        if name:  # skip broken pieces
+            result.append((name, type_str, description))
 
     return result
 
@@ -107,20 +111,101 @@ if __name__ == "__main__":
     SAMPLE_2 = (
         "field_with_internal_quotes: Literal['type_A', "
         '"type_B_with_\'_apostrophe"] | A literal with mixed quotes,'
-        " another_field: str"
+        " another_field :str| A field with a description"
+    )
+
+    SAMPLE_3 = (
+        "field_with_internal_quotes: Literal['type_A', "
+        '"type_B_with_\'_apostrophe"] | A literal with mixed quotes,'
+        " another_field | A field with a description"
+    )
+
+    SAMPLE_4 = "input, query, output"
+
+    SAMPLE_5 = (
+        "name: str | The character's full name,"
+        "race: str | The character's fantasy race,"
+        "class: Literal['mage','thief'] | The character's profession, which can be either mage or thief,"
+        "background: str | A brief backstory for the character"
+    )
+
+    SAMPLE_6 = (
+        "summary: str | A short blurb, e.g. key:value pairs that appear in logs"
     )
+    # ➜ [('summary', 'str',
+    #     'A short blurb, e.g. key:value pairs that appear in logs')]
 
-    print(f"Sample 1: {SAMPLE_1}")
-    print(f"Sample 2: {SAMPLE_2}")
+    SAMPLE_7 = "path: str | The literal string 'C:\\\\Program Files\\\\My,App'"
 
-    print("\nSplitting Sample 1:")
-    split_sample_1 = split_top_level(SAMPLE_1)
-    print(split_sample_1)
-    for field in split_sample_1:
-        print(parse_schema(field))
+    # ➜ [('path', 'str',
+    #     "The literal string 'C:\\Program Files\\My,App'")]
 
-    print("\nSplitting Sample 2:")
-    split_sample_2 = split_top_level(SAMPLE_2)
-    print(split_sample_2)
-    for field in split_sample_2:
-        print(parse_schema(field))
+    SAMPLE_8 = (
+        "transform: Callable[[int, str], bool] | Function that returns True on success,"
+        "retries: int | How many times to retry"
+    )
+    # ➜ ('transform', 'Callable[[int, str], bool]', 'Function that returns True on success')
+    #    ('retries',   'int',                         'How many times to retry')
+
+    SAMPLE_9 = (
+        r"regex: str | Pattern such as r'^[A-Z\|a-z]+$',"
+        "flags: int | re flags to use"
+    )
+    # ➜ ('regex', 'str', "Pattern such as r'^[A-Z\\|a-z]+$'")
+    #    ('flags', 'int', 're flags to use')
+
+    SAMPLE_10 = "id:int, name:str,"  # note the final comma!
+    # ➜ ('id', 'int', '')
+    #    ('name', 'str', '')
+
+    SAMPLE_11 = "id:int | Primary key\nname:str | Display name\nactive:bool"
+    # ➜ should not work!
+
+    SAMPLE_12 = (
+        'comment:str | The text "done | failed" goes here,'
+        'status:Literal["done","failed"]'
+    )
+    # ➜ ('comment', 'str',    'The text "done | failed" goes here')
+    #    ('status',  'Literal["done","failed"]', '')
+
+    SAMPLE_13 = "choice: Literal['He said \\'yes\\'', 'no'] | User response"
+    # ➜ ('choice', "Literal['He said \\'yes\\'', 'no']", 'User response')
+
+    SAMPLE_14 = ""
+    # ➜ []
+
+    SAMPLE_15 = "username"
+    # ➜ [('username', 'str', '')]
+
+    SAMPLE_16 = (
+        "payload: dict[str, list[dict[str, tuple[int,str]]]] "
+        "| Arbitrarily complex structure"
+    )
+    # ➜ ('payload', 'dict[str, list[dict[str, tuple[int,str]]]]',
+    #     'Arbitrarily complex structure')
+
+    SAMPLE_17 = "münze: str | Deutsche Münzbezeichnung, engl. 'coin'"
+    # ➜ [('münze', 'str', "Deutsche Münzbezeichnung, engl. 'coin'")]
+
+    for title, spec in [
+        ("Sample-1", SAMPLE_1),
+        ("Sample-2", SAMPLE_2),
+        ("Sample-3", SAMPLE_3),
+        ("Sample-4", SAMPLE_4),
+        ("Sample-5", SAMPLE_5),
+        ("Sample-6", SAMPLE_6),
+        ("Sample-7", SAMPLE_7),
+        ("Sample-8", SAMPLE_8),
+        ("Sample-9", SAMPLE_9),
+        ("Sample-10", SAMPLE_10),
+        ("Sample-11", SAMPLE_11),
+        ("Sample-12", SAMPLE_12),
+        ("Sample-13", SAMPLE_13),
+        ("Sample-14", SAMPLE_14),
+        ("Sample-15", SAMPLE_15),
+        ("Sample-16", SAMPLE_16),
+        ("Sample-17", SAMPLE_17),
+    ]:
+        print(f"\n{title}")
+        for row in parse_schema(spec):
+            print(row)

{flock_core-0.4.0b32.dist-info → flock_core-0.4.0b34.dist-info}/METADATA

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

{flock_core-0.4.0b32.dist-info → flock_core-0.4.0b34.dist-info}/RECORD

@@ -20,10 +20,10 @@ flock/cli/yaml_editor.py,sha256=K3N0bh61G1TSDAZDnurqW9e_-hO6CtSQKXQqlDhCjVo,1252
 flock/cli/assets/release_notes.md,sha256=bqnk50jxM3w5uY44Dc7MkdT8XmRREFxrVBAG9XCOSSU,4896
 flock/core/__init__.py,sha256=p7lmQULRu9ejIAELfanZiyMhW0CougIPvyFHW2nqBFQ,847
 flock/core/flock.py,sha256=_T_KAFePtEGDzfiFGV1HCdz7VHzj_U0cCquhAQ4xMAM,28199
-flock/core/flock_agent.py,sha256=VXNsnsiqsMvrVsTZBNPCa7qCH3LdzvGKg3-mKO-Hj64,39227
+flock/core/flock_agent.py,sha256=JTqaGD_OnZSd3bVU989WMsK1rAT6UGn-JYrPxFV15EE,39576
 flock/core/flock_evaluator.py,sha256=dOXZeDOGZcAmJ9ahqq_2bdGUU1VOXY4skmwTVpAjiVw,1685
 flock/core/flock_factory.py,sha256=_4zsjkEmJnCR7IvJ3SUHnDbX6c7Tt3E4P5ohxwKvE6w,3173
-flock/core/flock_module.py,sha256=2MdAh-n0o4uw7jogvW9iHjVPUawUNN1oGor5ego3RLI,3057
+flock/core/flock_module.py,sha256=UCK6TFe4viXs596zeng0GD3gln4ZNGu_gCWkXIIMREg,3090
 flock/core/flock_registry.py,sha256=Qcu9juUFNyDAOEsqVxauwVlWdfgKZrSzc8yT8JMiK-c,24246
 flock/core/flock_router.py,sha256=1OAXDsdaIIFApEfo6SRfFEDoTuGt3Si7n2MXiySEfis,2644
 flock/core/api/__init__.py,sha256=OKlhzDWZJfA6ddBwxQUmATY0TSzESsH032u00iVGvdA,228
@@ -71,12 +71,12 @@ flock/core/tools/llm_tools.py,sha256=Bdt4Dpur5dGpxd2KFEQyxjfZazvW1HCDKY6ydMj6UgQ
 flock/core/tools/markdown_tools.py,sha256=W6fGM48yGHbifVlaOk1jOtVcybfRbRmf20VbDOZv8S4,6031
 flock/core/tools/zendesk_tools.py,sha256=deZAyUi9j-_yZaTayLQVJaFXIqIct-P6C8IGN5UU_tM,3528
 flock/core/tools/dev_tools/github.py,sha256=a2OTPXS7kWOVA4zrZHynQDcsmEi4Pac5MfSjQOLePzA,5308
-flock/core/util/cli_helper.py,sha256=Q8GFizNKiMW3wMJwIOobR6ldP40wYCdcNqTgD5z4sPo,49951
+flock/core/util/cli_helper.py,sha256=g4u8kCtbwHRXETzBz1cw52_8muSWbWlr00CqST525jI,49963
 flock/core/util/file_path_utils.py,sha256=Odf7uU32C-x1KNighbNERSiMtkzW4h8laABIoFK7A5M,6246
 flock/core/util/hydrator.py,sha256=QJvCA8F4nkSP5akp3yg0cT6oaajOr1n7sldW5dCs6Lo,10733
 flock/core/util/input_resolver.py,sha256=KPoPSpklyCoiR2t5r6J6GJHegmPLFZ0YE126VcKBewM,4703
 flock/core/util/loader.py,sha256=j3q2qem5bFMP2SmMuYjb-ISxsNGNZd1baQmpvAnRUUk,2244
-flock/core/util/spliter.py,sha256=qGGbz2UN6v0nATymDzD_G656mWS9dXHrfQoore-lw9M,4027
+flock/core/util/spliter.py,sha256=D-P4u3vdKQFyC4DltpCoX4PExXuOKnE-G5kBG_6H678,6770
 flock/evaluators/declarative/declarative_evaluator.py,sha256=q3qKHuKrj17mhaoOZuKh2HyVfiDBEEUk1Y1ZrejvggA,6328
 flock/evaluators/memory/memory_evaluator.py,sha256=ySwz7kcc8suXMJ7gKNSWThW8iOMlE8lUcUzEAHvv8rw,3559
 flock/evaluators/test/test_case_evaluator.py,sha256=3Emcoty0LOLLBIuPGxSpKphuZC9Fu1DTr1vbGg-hd0Q,1233
@@ -445,8 +445,8 @@ flock/workflow/agent_execution_activity.py,sha256=Gy6FtuVAjf0NiUXmC3syS2eJpNQF4R
 flock/workflow/flock_workflow.py,sha256=iSUF_soFvWar0ffpkzE4irkDZRx0p4HnwmEBi_Ne2sY,9666
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=YIHnSBntzOchHfMSh8hoLeNXrz3B1UbR14YrR6soM7A,1606
-flock_core-0.4.0b32.dist-info/METADATA,sha256=XEuCjPQqyIbUkZHfPKCt-wRNAbArW9Yxj-3RxXIvwNM,17125
-flock_core-0.4.0b32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b32.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b32.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b32.dist-info/RECORD,,
+flock_core-0.4.0b34.dist-info/METADATA,sha256=xImOi53HupDqDi8RpnOjZfkS_rbLJQ6j_CrwoIR7RPA,17125
+flock_core-0.4.0b34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b34.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b34.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b34.dist-info/RECORD,,