refactor(context/memory): remove ctx variable queries from schema

npiai/constant/__init__.py

@@ -0,0 +1 @@
+CTX_QUERY_POSTFIX = "__ctx_query"

npiai/core/base.py

@@ -8,6 +8,7 @@
 from npiai.context import Context
 from npiai.core.hitl import HITL
 from npiai.types import FunctionRegistration
+from npiai.constant import CTX_QUERY_POSTFIX
 
 
 class BaseTool(ABC):
@@ -73,7 +74,7 @@ async def exec(self, ctx: Context, fn_name: str, args: Dict[str, Any] = None):
 
         # add context variables
         for ctx_var in fn.ctx_variables:
-            query = args.pop(f"{ctx_var.name}__query", ctx_var.query)
+            query = args.pop(f"{ctx_var.name}{CTX_QUERY_POSTFIX}", ctx_var.query)
 
             args[ctx_var.name] = await ctx.ask(
                 query=query,

npiai/core/tool/_function.py

@@ -28,6 +28,7 @@
     is_template_str,
 )
 from npiai.context import Context
+from npiai.constant import CTX_QUERY_POSTFIX
 
 __NPI_TOOL_ATTR__ = "__NPI_TOOL_ATTR__"
 
@@ -258,7 +259,7 @@ def _register_tools(self):
                             )
 
                             if is_template_str(anno.query):
-                                param_fields[f"{p.name}__query"] = (
+                                param_fields[f"{p.name}{CTX_QUERY_POSTFIX}"] = (
                                     str,
                                     Field(
                                         default=anno.query,

npiai/types/function_registration.py

@@ -6,6 +6,7 @@
 
 from npiai.types.shot import Shot
 from npiai.types.from_context import FromContext
+from npiai.constant import CTX_QUERY_POSTFIX
 
 ToolFunction = Callable[..., Awaitable[str]]
 
@@ -22,10 +23,17 @@ class FunctionRegistration:
     few_shots: Optional[List[Shot]] = None
 
     def get_meta(self):
+        params = {}
+
+        for name in self.schema:
+            # remove context variable queries
+            if not name.endswith(CTX_QUERY_POSTFIX):
+                params[name] = self.schema[name]
+
         return {
             "description": self.description,
             "name": self.name,
-            "parameters": self.schema,
+            "parameters": params,
             "fewShots": (
                 [asdict(ex) for ex in self.few_shots] if self.few_shots else None
             ),