renamed Context() -> AskerContext(); added more detailed detailed examples to the prompt

Author: ds-jakub-cierocki

src/dbally/context/_utils.py

@@ -1,5 +1,5 @@
 from inspect import isclass
-from typing import Any, Optional, Sequence, List, Tuple, Type, Union
+from typing import Any, List, Optional, Sequence, Tuple, Type, Union
 
 import typing_extensions as type_ext
 

src/dbally/context/context.py

@@ -17,7 +17,7 @@ class BaseCallerContext(ABC):
     a class implementing this interface, selected based on the filter method signature (type hints).
     """
 
-    _alias: str = "Context"
+    _alias: str = "AskerContext"
 
     @classmethod
     def select_context(cls, contexts: Iterable[CustomContext]) -> Self:

src/dbally/iql_generator/prompt.py

@@ -74,10 +74,11 @@ def __init__(
                 "You MUST use only these methods:\n"
                 "\n{filters}\n"
                 "It is VERY IMPORTANT not to use methods other than those listed above."
-                "Finally, if a called function argument value is not directly specified in the query but instead requires knowledge of some additional context, than substitute that argument value by: Context()."
-                'The typical input phrase referencing some additional context contains the word "my" or similar phrasing, e.g. "my position name", "my company valuation".'
+                "Finally, if a called function argument value is not directly specified in the query but instead requires some additional execution context, than substitute that argument value by: AskerContext()."
+                'The typical input phrase suggesting that the additional execution context need to be referenced contains words like: "I", "my", "mine", "current", "the" etc..'
+                'For example: "my position name", "my company valuation", "current day", "the ongoing project".'
                 "In that case, the part of the output will look like this:"
-                "filter4(Context())"
+                "filter4(AskerContext())"
                 """If you DON'T KNOW HOW TO ANSWER DON'T SAY \"\", SAY: `UNSUPPORTED QUERY` INSTEAD! """
                 "This is CRUCIAL, otherwise the system will crash. "
             ),

tests/unit/iql/test_iql_parser.py

@@ -26,7 +26,7 @@ async def test_iql_parser():
     custom_context2 = AnotherTestCustomContext(some_field="aaa")
 
     parsed = await IQLQuery.parse(
-        "not (filter_by_name(['John', 'Anne']) and filter_by_city(Context()) and filter_by_company('deepsense.ai'))",
+        "not (filter_by_name(['John', 'Anne']) and filter_by_city(AskerContext()) and filter_by_company('deepsense.ai'))",
         allowed_functions=[
             ExposedFunction(
                 name="filter_by_name", description="", parameters=[MethodParamWithTyping(name="name", type=List[str])]

tests/unit/test_iql_format.py

@@ -23,10 +23,11 @@ async def test_iql_prompt_format_default() -> None:
             "You MUST use only these methods:\n"
             "\n\n"
             "It is VERY IMPORTANT not to use methods other than those listed above."
-            "Finally, if a called function argument value is not directly specified in the query but instead requires knowledge of some additional context, than substitute that argument value by: Context()."
-            'The typical input phrase referencing some additional context contains the word "my" or similar phrasing, e.g. "my position name", "my company valuation".'
+            "Finally, if a called function argument value is not directly specified in the query but instead requires some additional execution context, than substitute that argument value by: AskerContext()."
+            'The typical input phrase suggesting that the additional execution context need to be referenced contains words like: "I", "my", "mine", "current", "the" etc..'
+            'For example: "my position name", "my company valuation", "current day", "the ongoing project".'
             "In that case, the part of the output will look like this:"
-            "filter4(Context())"
+            "filter4(AskerContext())"
             """If you DON'T KNOW HOW TO ANSWER DON'T SAY \"\", SAY: `UNSUPPORTED QUERY` INSTEAD! """
             "This is CRUCIAL, otherwise the system will crash. ",
             "is_example": False,
@@ -57,10 +58,11 @@ async def test_iql_prompt_format_few_shots_injected() -> None:
             "You MUST use only these methods:\n"
             "\n\n"
             "It is VERY IMPORTANT not to use methods other than those listed above."
-            "Finally, if a called function argument value is not directly specified in the query but instead requires knowledge of some additional context, than substitute that argument value by: Context()."
-            'The typical input phrase referencing some additional context contains the word "my" or similar phrasing, e.g. "my position name", "my company valuation".'
+            "Finally, if a called function argument value is not directly specified in the query but instead requires some additional execution context, than substitute that argument value by: AskerContext()."
+            'The typical input phrase suggesting that the additional execution context need to be referenced contains words like: "I", "my", "mine", "current", "the" etc..'
+            'For example: "my position name", "my company valuation", "current day", "the ongoing project".'
             "In that case, the part of the output will look like this:"
-            "filter4(Context())"
+            "filter4(AskerContext())"
             """If you DON'T KNOW HOW TO ANSWER DON'T SAY \"\", SAY: `UNSUPPORTED QUERY` INSTEAD! """
             "This is CRUCIAL, otherwise the system will crash. ",
             "is_example": False,

tests/unit/views/test_sqlalchemy_base.py

@@ -60,7 +60,7 @@ async def test_filter_sql_generation() -> None:
     mock_connection = sqlalchemy.create_mock_engine("postgresql://", executor=None)
     mock_view = MockSqlAlchemyView(mock_connection.engine)
     query = await IQLQuery.parse(
-        'method_foo(1) and method_bar("London", 2020) and method_baz(BaseCallerContext())',
+        'method_foo(1) and method_bar("London", 2020) and method_baz(AskerContext())',
         allowed_functions=mock_view.list_filters(),
         contexts=[SomeTestContext(age=69)],
     )