Fix Instructions resolution

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "uv_build"
 [project]
 name = "draive"
 description = "Framework designed to simplify and accelerate the development of LLM-based applications."
-version = "0.79.1"
+version = "0.79.2"
 readme = "README.md"
 maintainers = [
   { name = "Kacper Kaliński", email = "kacper.kalinski@miquido.com" },

src/draive/instructions/file.py

@@ -34,7 +34,7 @@ def __init__(
         self._storage: Mapping[str, str] | None = None
         self._listing: Sequence[InstructionDeclaration] | None = None
 
-    async def listing(
+    async def fetch_list(
         self,
         **extra: Any,
     ) -> Sequence[InstructionDeclaration]:
@@ -60,7 +60,7 @@ async def listing(
 
         return self._listing
 
-    async def instruction(
+    async def fetch_instruction(
         self,
         name: str,
         *,

src/draive/instructions/state.py

@@ -18,13 +18,13 @@
 __all__ = ("Instructions",)
 
 
-async def _empty(
+async def _empty_list(
     **extra: Any,
 ) -> Sequence[InstructionDeclaration]:
     return ()
 
 
-async def _none(
+async def _no_instruction(
     name: str,
     /,
     *,
@@ -45,8 +45,8 @@ def of(
         storage = InstructionsVolatileStorage((instruction, *instructions))
 
         return cls(
-            list_fetching=storage.listing,
-            fetching=storage.instruction,
+            list_fetching=storage.fetch_list,
+            fetching=storage.fetch_instruction,
         )
 
     @classmethod
@@ -57,8 +57,8 @@ def file(
         storage = InstructionsFileStorage(path=path)
 
         return cls(
-            list_fetching=storage.listing,
-            fetching=storage.instruction,
+            list_fetching=storage.fetch_list,
+            fetching=storage.fetch_instruction,
         )
 
     @classmethod
@@ -126,26 +126,22 @@ async def fetch(
         elif required and default is None:
             raise InstructionMissing(f"Missing instruction: '{name}'")
 
+        elif default is None:
+            return None
+
         elif isinstance(default, str):
             return Instruction.of(
                 default,
                 name=name,
-                description=instruction.description
-                if isinstance(instruction, InstructionDeclaration)
-                else None,
-                meta=None,
                 arguments=arguments,
             )
 
-        elif default is not None:
+        else:
             return Instruction.of(
                 default,
                 arguments=arguments,
             )
 
-        else:
-            return None
-
-    list_fetching: InstructionListFetching = _empty
-    fetching: InstructionFetching = _none
+    list_fetching: InstructionListFetching = _empty_list
+    fetching: InstructionFetching = _no_instruction
     meta: Meta = META_EMPTY

src/draive/instructions/template.py

@@ -23,11 +23,11 @@ class InstructionTemplate[**Args](ParametrizedFunction[Args, Coroutine[None, Non
     def __init__(
         self,
         /,
-        name: str,
+        function: Callable[Args, Coroutine[None, None, str]],
         *,
+        name: str,
         description: str | None,
         meta: Meta,
-        function: Callable[Args, Coroutine[None, None, str]],
     ) -> None:
         super().__init__(function)
 
@@ -104,10 +104,10 @@ def wrap[**Arg](
         function: Callable[Arg, Coroutine[None, None, str]],
     ) -> InstructionTemplate[Arg]:
         return InstructionTemplate[Arg](
+            function=function,
             name=name or function.__name__,
             description=description,
             meta=Meta.of(meta),
-            function=function,
         )
 
     if function := function:

src/draive/instructions/types.py

@@ -92,8 +92,8 @@ def of(
         *,
         name: str | None = None,
         description: str | None = None,
-        meta: Meta | MetaValues | None = None,
         arguments: Mapping[str, str | float | int] | None = None,
+        meta: Meta | MetaValues | None = None,
     ) -> Self: ...
 
     @overload
@@ -105,8 +105,8 @@ def of(
         *,
         name: str | None = None,
         description: str | None = None,
-        meta: Meta | MetaValues | None = None,
         arguments: Mapping[str, str | float | int] | None = None,
+        meta: Meta | MetaValues | None = None,
     ) -> Self | None: ...
 
     @classmethod
@@ -117,37 +117,34 @@ def of(
         *,
         name: str | None = None,
         description: str | None = None,
-        meta: Meta | MetaValues | None = None,
         arguments: Mapping[str, str | float | int] | None = None,
+        meta: Meta | MetaValues | None = None,
     ) -> Self | None:
-        match instruction:
-            case None:
-                return None
-
-            case str() as content:
-                return cls(
-                    name=name or uuid4().hex,
-                    description=description,
-                    content=content,
-                    arguments=arguments if arguments is not None else {},
-                    meta=Meta.of(meta),
-                )
+        if instruction is None:
+            return None
+
+        elif isinstance(instruction, str):
+            return cls(
+                name=name or uuid4().hex,
+                description=description,
+                content=instruction,
+                arguments=arguments if arguments is not None else {},
+                meta=Meta.of(meta),
+            )
 
-            case instruction:
-                if name is None and description is None and meta is None and arguments is None:
-                    return instruction  # nothing to update
-
-                return instruction.updated(
-                    name=name or instruction.name,
-                    description=description or instruction.description,
-                    content=instruction.content,
-                    arguments={**instruction.arguments, **arguments}
-                    if arguments is not None
-                    else instruction.arguments,
-                    meta=instruction.meta.merged_with(meta)
-                    if meta is not None
-                    else instruction.meta,
-                )
+        else:
+            if name is None and description is None and meta is None and arguments is None:
+                return instruction  # nothing to update
+
+            return instruction.updated(
+                name=name or instruction.name,
+                description=description or instruction.description,
+                content=instruction.content,
+                arguments={**instruction.arguments, **arguments}
+                if arguments is not None
+                else instruction.arguments,
+                meta=instruction.meta.merged_with(meta) if meta is not None else instruction.meta,
+            )
 
     name: str
     description: str | None = None
@@ -176,11 +173,8 @@ def format(
                 },
             )
 
-        elif self.arguments:
-            return self.content.format_map(self.arguments)
-
         else:
-            return self.content
+            return self.content.format_map(self.arguments)
 
     def extended(
         self,

src/draive/instructions/volatile.py

@@ -12,6 +12,11 @@
 
 @final
 class InstructionsVolatileStorage:
+    __slots__ = (
+        "_listing",
+        "_storage",
+    )
+
     def __init__(
         self,
         instructions: Sequence[Instruction],
@@ -23,13 +28,13 @@ def __init__(
             instruction.declaration for instruction in instructions
         ]
 
-    async def listing(
+    async def fetch_list(
         self,
         **extra: Any,
     ) -> Sequence[InstructionDeclaration]:
         return self._listing
 
-    async def instruction(
+    async def fetch_instruction(
         self,
         name: str,
         *,