ApiLogicServer 14.5.4__py3-none-any.whl → 14.5.14__py3-none-any.whl

api_logic_server_cli/prototypes/base/database/system/SAFRSBaseX.pyZ

@@ -0,0 +1,73 @@
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import Column, DECIMAL, Date, ForeignKey, Integer, String
+from safrs import SAFRSBase
+from flask_login import UserMixin
+import safrs, flask_sqlalchemy
+from safrs import jsonapi_attr
+from flask_sqlalchemy import SQLAlchemy
+from datetime import datetime
+
+Base = declarative_base()  # type: flask_sqlalchemy.model.DefaultMeta
+#vh new x
+@classmethod
+def jsonapi_filter(cls):
+    """
+    Use this to override SAFRS JSON:API filtering
+
+    Returns:
+        _type_: SQLAlchemy query filter
+    """
+    from sqlalchemy import text, or_, and_
+    from flask import request
+    expressions = []
+    sqlWhere = ""
+    query = cls._s_query
+    if args := request.args:
+        from api.system.expression_parser import advancedFilter
+        expressions, sqlWhere = advancedFilter(cls, args)
+    if sqlWhere != "":    
+        return query.filter(text(sqlWhere))
+    else:
+        return query.filter(or_(*expressions))   
+
+class SAFRSBaseX(SAFRSBase, safrs.DB.Model):
+    __abstract__ = True
+    if do_enable_ont_advanced_filters := False:
+        jsonapi_filter = jsonapi_filter
+        
+    def _s_parse_attr_value(self, attr_name: str, attr_val: any):
+        """
+        Parse the given jsonapi attribute value so it can be stored in the db
+        :param attr_name: attribute name
+        :param attr_val: attribute value
+        :return: parsed value
+        """
+        attr = self.__class__._s_jsonapi_attrs.get(attr_name, None)
+        if hasattr(attr, "type"):  # pragma: no cover
+            
+            if str(attr.type) in ["DATE", "DATETIME"] and attr_val:
+                try:
+                    attr_val = attr_val.replace("T", " ")
+                    datetime.strptime(attr_val, '%Y-%m-%d %H:%M')
+                    attr_val += ":00"
+                except ValueError:
+                    pass
+                except Exception as exc:
+                    safrs.log.warning(exc)
+        
+        
+        return super()._s_parse_attr_value(attr_name, attr_val)
+
+class TestBase(Base):
+    __abstract__ = True
+    def __init__(self, *args, **kwargs):
+        for name, val in kwargs.items():
+            col = getattr(self.__class__, name)
+            if 'amount_total' == name:
+                debug_stop = 'stop'
+            if val is not None:
+                if str(col.type) in ["DATE", "DATETIME"]:
+                    pass
+                else:
+                    kwargs[name] = col.type.python_type(val)
+        return super().__init__(*args, **kwargs)

api_logic_server_cli/prototypes/base/integration/mcp/README_mcp.md

@@ -0,0 +1,15 @@
+Model Context Protocol is a way for:
+
+1. **Bus User ad hoc flows** using existing published mcp services (vs. hard-coding in IT as an endpoint; flows can be cached for repeated use)
+
+    * ***Natural Language access*** to corporate databases for improved user interfaces
+
+    * LLMs ***choreograph*** multiple MCP calls (to 1 or more MCP servers) in a chain of calls - an agentic workflow. MCPs support shared contexts and goals, enabling the LLM to use the result from 1 call to determine whether the goals has been reached, or which service is appropriate to call next
+
+3. Chat agents to ***discover*** and ***call*** external servers, be they databases, APIs, file systems, etc. MCPs support shared contexts and goals, enabling the LLM
+
+    * ***Corporate database participation*** in such flows, by making key functions available as MCP calls.
+
+This example is [explained here](https://apilogicserver.github.io/Docs/Integration-MCP/).
+
+> Note: this sample uses multi-term filters.  These are usually OR'd together, but this example requires AND.  This is provided by `database/system/SAFRSBaseX.py` (see `return query.filter(operator.and_(*expressions)`) in `_s_filter()`), activated in `config/server_setup.py`.

api_logic_server_cli/prototypes/{basic_demo/customizations → base}/integration/mcp/mcp_client_executor.py

@@ -13,10 +13,12 @@ Notes:
 """
 
 import json
-import os
-import re
+import os, sys
+from typing import Dict, List
 import openai
 import requests
+from logic_bank.logic_bank import Rule
+from logic_bank.util import ConstraintException
 
 # Set your OpenAI API key
 openai.api_key = os.getenv("APILOGICSERVER_CHATGPT_APIKEY")
@@ -37,24 +39,13 @@ def discover_mcp_servers():
     global server_url, use_test_schema
 
     # create schema_text (for prompt), by reading integration/mcp/mcp_schema.txt
-    if use_test_schema:
-        schema_file_path = os.path.join(os.path.dirname(__file__), "mcp_schema.txt")
-        try:
-            with open(schema_file_path, "r") as schema_file:
-                schema_text = schema_file.read()
-        except FileNotFoundError:
-                print(f"Schema file not found at {schema_file_path}.")
-                exit(1)
-        finally:
-            print(f"Schema file loaded from {schema_file_path}.")
-        return schema_text
 
     # find the servers - read the mcp_server_discovery.json file
-    discovery_file_path = os.path.join(os.path.dirname(__file__), "mcp_server_discovery.json")
+    discovery_file_path = os.path.join(os.path.dirname(__file__), "../../integration/mcp/mcp_server_discovery.json")
     try:
         with open(discovery_file_path, "r") as discovery_file:
             discovery_data = json.load(discovery_file)
-            print(f"\nDiscovered MCP servers from config file: {discovery_file_path}:" + json.dumps(discovery_data, indent=4))
+            print(f"\n1. Discovered MCP servers from config file: {discovery_file_path}:" + json.dumps(discovery_data, indent=4))
     except FileNotFoundError:
         print(f"Discovery file not found at {discovery_file_path}.")
     except json.JSONDecodeError as e:
@@ -69,7 +60,8 @@ def discover_mcp_servers():
             if response.status_code == 200:
                 api_schema = response.json()
                 print()
-                print(f"\n1. API Schema from discovery schema_url: {discovery_url}:\n" +json.dumps(api_schema, indent=4))
+                request_print = json.dumps(api_schema, indent=4)[0:400] + '\n... etc'  # limit for readability
+                print(f"\n\nAPI Schema from discovery schema_url: {discovery_url}:\n" + request_print)
             else:
                 print(f"Failed to retrieve API schema from {discovery_url}: {response.status_code}")
         except requests.RequestException as e:
@@ -77,24 +69,33 @@ def discover_mcp_servers():
     return json.dumps(api_schema)
 
 
-def get_user_nl_query():
+def get_user_nl_query_and_training(query: str):
     """ Get the natural language query from the user. 
-    Add instructions for the LLM to generate a tool context block.
+    Add training for the LLM to generate a tool context block.
     
     """
 
     global test_type
-
-    if len(sys.argv) > 1 and sys.argv[1] != 'go':
-        request = sys.argv[1]
+    # read file docs/mcp_learning/mcp.prompt
+    prompt_file_path = os.path.join(os.path.dirname(__file__), "../../docs/mcp_learning/mcp.prompt")
+    if os.path.exists(prompt_file_path):
+        with open(prompt_file_path, "r") as prompt_file:
+            training_prompt = prompt_file.read()
+            # print(f"\nLoaded training prompt from {prompt_file_path}:\n{training_prompt}")
     else:
-        request = "List the unshipped orders created before 2023-07-14, and send a discount email to the customer for each one."
-        if test_type != 'orchestration':
-            request = "List customers with credit over 1000"
-    return request
+        training_prompt = ""
+        print(f"Prompt file not found at {prompt_file_path}.")
 
+    # if 1 argument, use it as the query
+    query_actual = query
+    if len(sys.argv) > 1:
+        query_actual = sys.argv[1]
+        if query_actual == '':
+            query_actual = "list customers with balance over 100."
+    return query_actual + ";\n\n" + training_prompt
 
-def query_llm_with_nl(nl_query):
+
+def query_llm_with_nl(schema_text, nl_query):
     """ 
     Query the LLM with a natural language query and schema text to generate a tool context block.
 
@@ -103,6 +104,7 @@ def query_llm_with_nl(nl_query):
 
     global test_type, create_tool_context_from_llm
 
+    content = f"Natural language query:\n {nl_query}\nSchema:\n{schema_text}"
     messages = [
         {
             "role": "system",
@@ -110,70 +112,18 @@ def query_llm_with_nl(nl_query):
         },
         {
             "role": "user",
-            "content": f"Schema:\n{schema_text}\n\nNatural language query: '{nl_query}'"
+            "content": f"{content}"
         }
     ]
 
-    # setup default tool_context to bypass LLM call and save 2-3 secs in testing
-    if test_type == 'orchestration':     # orchestration: emails to pending orders
-
-        tool_context = \
-            {
-                "tool_type": "json-api",
-                "schema_version": "1.0",
-                "base_url": "http://localhost:5656/api",
-                "resources": [
-                    {
-                        "path": "/Order",
-                        "method": "GET",
-                        "query_params": [
-                            {
-                                "name": "date_shipped",
-                                "op": "eq",
-                                "val": None
-                            },
-                            {
-                                "name": "date_created",
-                                "op": "lt",
-                                "val": "2023-07-14"
-                            }
-                        ],
-                        "headers": [],
-                        "expected_output": []
-                    },
-                    {
-                        "path": "/Email",
-                        "method": "POST",
-                        "body": {
-                            "customer_id": "{{ order.customer_id }}",
-                            "message": "You have a discount on your unshipped order."
-                        },
-                        "headers": [],
-                        "expected_output": []
-                    }
-                ]
-            }
-    else:                                   # simple get request - list customers with credit over 1000 
-        tool_context = \
-            {
-                "tool_type": "json-api",
-                "schema_version": "1.0",
-                "base_url": "http://localhost:5656/api",
-                "resources": [
-                    {
-                        "path": "/Customer",
-                        "method": "GET",
-                        "query_params": [
-                            {
-                                "name": "credit_limit",
-                                "op": "gt",
-                                "val": "1000"
-                            }
-                        ]
-                    }
-                ]
-            }    # Call the OpenAI API to generate the tool context        
-    if create_tool_context_from_llm:  # saves 2-3 seconds...
+    request_print = content[0:1200] + '\n... etc'  # limit for readability
+    print("\n\n2a. LLM request:\n", request_print)
+    # print("\n2b. NL Query:\n", nl_query)
+    # print("\n2c. schema_text: (truncated) \n")
+    # schema_print = json.dumps(json.loads(schema_text), indent=4)[:400]  # limit for readability
+    # print(schema_print)
+
+    if create_tool_context_from_llm:  # takes 2-3 seconds...
       response = openai.chat.completions.create(
           model="gpt-4",
           messages=messages,
@@ -188,17 +138,17 @@ def query_llm_with_nl(nl_query):
           print("Failed to decode JSON from response:", tool_context_str)
           return None
 
-    print("\n\n2a. LLM request:\n", json.dumps(messages, indent=4))
-    print("\n2b. NL Query:\n", nl_query)
-    print("\n2c. schema_text: \n", json.dumps(json.loads(schema_text), indent=4))  #schema_text[0:100])
     print("\n2d. generated tool context from LLM:\n", json.dumps(tool_context, indent=4))
+
+    if "resources" not in tool_context:
+        raise ConstraintException("GenAI Error - LLM response does not contain 'resources'.")
     return tool_context
 
 
 def process_tool_context(tool_context):
     """ Process the orchestration request by executing multiple tool context blocks.
-    This function simulates the MCP Client Executor by executing the tool context blocks
-    against a live JSON:API server. It handles both GET and POST requests, and it can
+    This executes the tool context blocks against a live JSON:API server. 
+    It handles both GET and POST requests, and it can
     orchestrate multiple requests based on the provided tool context.
 
     Note the orchestration is processed by the client executor (here), not the server executor.
@@ -247,36 +197,72 @@ def process_tool_context(tool_context):
         query_param_filter = 'filter=' + str(query_params)
         # use urlencode to convert to JSON:API format...
         # val urllib.parse.quote() or urllib.parse.urlencode()
-        # tool instructions... filtering, email etc
+        # tool instructions... filtering, email etc "null"
         query_param_filter = query_param_filter.replace("'", '"')  # convert single quotes to double quotes
         query_param_filter = query_param_filter.replace("None", 'null')
-        query_param_filter = query_param_filter.replace("date_created", 'CreatedOn')  # TODO - why this name?
+        query_param_filter = query_param_filter.replace('"null"', 'null')
+        # query_param_filter = query_param_filter.replace("date_created", 'CreatedOn')  # TODO - why this name?
         return query_param_filter  # end get_query_param_filter
 
+    def move_fields(src: dict, dest: dict, context_data: dict):
+        """ Move fields from src to dest, replacing any variables with their values from context_data."""
+        for variable_name, value in src.items():
+            move_value = value
+            if move_value.startswith("{") and move_value.endswith("}"):  
+                # strip the braces, and get the name after the first dot, # eg: "{Order.customer_id}" ==> "customer_id"``
+                move_name = move_value[1:-1]  # strip the braces
+                if '.' in move_value:
+                    move_name = move_name.split('.', 1)[1]
+                move_value = context_data['attributes'][move_name]
+            dest[variable_name] = move_value
+        return dest
+
+    def print_get_response(query_param_filter, mcp_response):
+        """ Print the response from the GET request. """
+        print("\n3. MCP Server (als) GET filter(query_param_filter):\n", query_param_filter)
+        print("     GET Response:\n", mcp_response.text)
+        results : List[Dict] = mcp_response.json()['data']
+        # print results in a table format
+        if results:
+            # Get all unique keys from all result dicts
+            keys = set()
+            for row in results:
+                if isinstance(row, dict):
+                    keys.update(row.keys())
+            keys = list(keys)
+            # Print header
+            print("\n| " + " | ".join(keys) + " |")
+            print("|" + "|".join(["---"] * len(keys)) + "|")
+            # Print rows
+            for row in results:
+                print("| " + " | ".join(str(row.get(k, "")) for k in keys) + " |")
+        else:
+            print("No results found.")
+
     assert isinstance(tool_context, (dict, list)), "Tool context expected to be a dictionary"
     context_data = {}
     added_rows = 0
 
     for each_block in tool_context["resources"]:
-        if True:  # TODO - add check for "tool": "json-api"
+        if process_tool_context := True:
             if each_block["method"] == "GET":
                     query_param_filter = get_query_param_filter(each_block["query_params"])
                     headers = {"Content-Type": "application/vnd.api+json"}
                     if "headers" in each_block:
                         headers.update(each_block["headers"])
                     mcp_response = requests.get(
-                        url = tool_context["base_url"] + each_block["path"],
+                        url = each_block["base_url"] + each_block["path"],
                         headers=headers,
                         params=query_param_filter
                     )
                     context_data = mcp_response.json()['data']  # result rows...
+                    print_get_response(query_param_filter, mcp_response)
             elif each_block["method"] in ["POST"]:
                     for each_order in context_data:
-                        url = tool_context["base_url"] + each_block["path"]
+                        url = each_block["base_url"] + each_block["path"]
                         json_update_data =  { 'data': {"type": "Email", 'attributes': {} } }  
                         json_update_data_attributes = json_update_data["data"]["attributes"]
-                        json_update_data_attributes["customer_id"] = context_data[0]['attributes']["customer_id"]  # TODO - fix
-                        json_update_data_attributes["message"] = each_block["body"]["message"] 
+                        move_fields( src= each_block["body"], dest=json_update_data_attributes, context_data=each_order) 
                         # eg: POST http://localhost:5656/api/Email {'data': {'type': 'Email', 'attributes': {'customer_id': 5, 'message': {'to': '{{ order.customer_id }}', 'subject': 'Discount for your order', 'body': 'Dear customer, you have a discount for your recent order. Thank you for shopping with us.'}}}}
                         headers = {"Content-Type": "application/vnd.api+json"}
                         if "headers" in each_block:
@@ -288,20 +274,22 @@ def process_tool_context(tool_context):
                         )
                         added_rows += 1
         pass
-    print("\n3. MCP Server (als) Response:\n", mcp_response.text)
+    print("\n3. MCP Server (als) POST Response:\n", mcp_response.text)
     if added_rows > 0:
         print(f"...Added {added_rows} rows to the database; last row (only) shown above.")
     return mcp_response 
 
 
 if __name__ == "__main__":
-    import sys
+
+    # to run: Run Config > Run designated Python file
 
     schema_text = discover_mcp_servers()                # see: 1-discovery-from-als
 
-    query = get_user_nl_query()
+    query = "list customers with balance over 100"
+    prompt = get_user_nl_query_and_training(query)            # set breakpoint here, view log, then step
 
-    tool_context = query_llm_with_nl(query)             # see: 2-tool-context-from-LLM   
+    tool_context = query_llm_with_nl(schema_text, prompt)             # see: 2-tool-context-from-LLM   
 
     mcp_response = process_tool_context(tool_context)   # see: 3-MCP-server response
 

api_logic_server_cli/prototypes/base/integration/mcp/mcp_schema.txt

@@ -0,0 +1,47 @@
+Customer:
+  - id (INTEGER)
+  - name (VARCHAR)
+  - balance (DECIMAL)
+  - credit_limit (DECIMAL)
+  * Filterable: name, balance, credit_limit
+  * Example: 'List customers with credit over 5000'
+
+Item:
+  - id (INTEGER)
+  - order_id (INTEGER)
+  - product_id (INTEGER)
+  - quantity (INTEGER)
+  - amount (DECIMAL)
+  - unit_price (DECIMAL)
+  * Filterable: order_id, product_id, unit_price
+  * Relationships:
+    ↪ relates to Order
+    ↪ relates to Product
+  * Example: 'Find all items for order 42'
+
+Email:
+  - id (INTEGER)
+  - message (VARCHAR)
+  - customer_id (INTEGER)
+  * Relationships:
+    ↪ relates to Customer
+  * Example: 'Post an message "text" for customer 2 means POST to this resource'
+
+Order:
+  - id (INTEGER)
+  - notes (VARCHAR)
+  - customer_id (INTEGER)
+  - CreatedOn (DATE)
+  - date_shipped (DATE)
+  - amount_total (DECIMAL)
+  * Filterable: notes, customer_id, date_shipped, amount_total
+  * Relationships:
+    ↪ relates to Customer
+  * Example: 'Get orders shipped in 2024'
+
+Product:
+  - id (INTEGER)
+  - name (VARCHAR)
+  - unit_price (DECIMAL)
+  * Filterable: name, unit_price
+  * Example: 'Show products with price over 100'

api_logic_server_cli/prototypes/base/integration/mcp/mcp_server_discovery.json

@@ -0,0 +1,9 @@
+{
+  "servers": [
+    {
+      "name": "API Logic Server: basic_demo",
+      "base_url": "http://localhost:5656",
+      "schema_url": "http://localhost:5656/.well-known/mcp.json"
+    }
+  ]
+}

api_logic_server_cli/prototypes/base/integration/mcp/test_notes.txt

@@ -0,0 +1,37 @@
+LLM request - new...?
+
+[
+    {
+        "role": "system",
+        "content": "You are an API planner that converts natural language queries into MCP Tool Context blocks using JSON:API. Return only the tool context as JSON."
+    },
+    {
+        "role": "user",
+        "content": "Schema:\n{\"base_url\": \"http://localhost:5656/api\", \"description\": \"API Logic Project: basic_demo\", \"email_services\": \"iff email is requested, Send email by issing a POST request to the Email endpoint, setting the subject, message and customer_id in the body.\", \"expected_response\": \"Respond with a JSON object with schema_version and a resource array including: tool_type, base_url, path, method, query_params array or body, headers.\", \"query_params\": \"- JSON:API custom filtering using a filter array (e.g., filter=[{\\\"name\\\":\\\"date_shipped\\\",\\\"op\\\":\\\"gt\\\",\\\"val\\\":\\\"2023-07-14\\\"}])\", \"resources\": [{\"fields\": [\"id\", \"name\", \"balance\", \"credit_limit\"], \"filterable\": [\"id\", \"name\", \"balance\", \"credit_limit\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Customer\", \"path\": \"/Customer\"}, {\"fields\": [\"id\", \"order_id\", \"product_id\", \"quantity\", \"amount\", \"unit_price\"], \"filterable\": [\"id\", \"order_id\", \"product_id\", \"quantity\", \"amount\", \"unit_price\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Item\", \"path\": \"/Item\"}, {\"fields\": [\"id\", \"notes\", \"customer_id\", \"date_shipped\", \"amount_total\"], \"filterable\": [\"id\", \"notes\", \"customer_id\", \"date_shipped\", \"amount_total\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Order\", \"path\": \"/Order\"}, {\"fields\": [\"id\", \"name\", \"unit_price\"], \"filterable\": [\"id\", \"name\", \"unit_price\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Product\", \"path\": \"/Product\"}, {\"fields\": [\"id\", \"request\", \"request_prompt\", \"completion\"], \"filterable\": [\"id\", \"request\", \"request_prompt\", \"completion\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Mcp\", \"path\": \"/Mcp\"}], \"schema_version\": \"1.0\", \"tool_type\": \"json-api\"}\n\nNatural language query: 'List the unshipped orders created before 2023-07-14, and send a discount email (subject: 'Discount Offer') to the customer for each one.'"
+    }
+]
+
+LLM request - old
+ [
+    {
+        "role": "system",
+        "content": "You are an API planner that converts natural language queries into MCP Tool Context blocks using JSON:API. Return only the tool context as JSON."
+    },
+    {
+        "role": "user",
+        "content": "Schema:\n{\"base_url\": \"http://localhost:5656/api\", \"description\": \"API Logic Project: basic_demo\", \"email_services\": \"iff email is requested, Send email by issing a POST request to the Email endpoint, setting the subject, message and customer_id in the body.\", \"expected_response\": \"Respond with a JSON object with schema_version and a resource array including: tool_type, base_url, path, method, query_params array or body, headers.\", \"query_params\": \"- JSON:API custom filtering using a filter array (e.g., filter=[{\\\"name\\\":\\\"date_shipped\\\",\\\"op\\\":\\\"gt\\\",\\\"val\\\":\\\"2023-07-14\\\"}])\", \"resources\": [{\"fields\": [\"id\", \"name\", \"balance\", \"credit_limit\"], \"filterable\": [\"id\", \"name\", \"balance\", \"credit_limit\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Customer\", \"path\": \"/Customer\"}, {\"fields\": [\"id\", \"order_id\", \"product_id\", \"quantity\", \"amount\", \"unit_price\"], \"filterable\": [\"id\", \"order_id\", \"product_id\", \"quantity\", \"amount\", \"unit_price\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Item\", \"path\": \"/Item\"}, {\"fields\": [\"id\", \"notes\", \"customer_id\", \"date_shipped\", \"amount_total\"], \"filterable\": [\"id\", \"notes\", \"customer_id\", \"date_shipped\", \"amount_total\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Order\", \"path\": \"/Order\"}, {\"fields\": [\"id\", \"name\", \"unit_price\"], \"filterable\": [\"id\", \"name\", \"unit_price\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Product\", \"path\": \"/Product\"}, {\"fields\": [\"id\", \"request\", \"request_prompt\", \"completion\"], \"filterable\": [\"id\", \"request\", \"request_prompt\", \"completion\"], \"methods\": [\"GET\", \"PATCH\", \"POST\", \"DELETE\"], \"name\": \"Mcp\", \"path\": \"/Mcp\"}], \"schema_version\": \"1.0\", \"tool_type\": \"json-api\"}\n\nNatural language query: 'List the unshipped orders created before 2023-07-14, and send a discount email (subject: 'Discount Offer') to the customer for each one.'"
+    }
+]
+
+
+messages - new
+[{'role': 'system', 'content': 'You are an API planner that converts natural language queries into MCP Tool Context b...API. Return only the tool context as JSON.'}, {'role': 'user', 'content': 'Schema:\n{"base_url": "http://localhost:5656/api", "description": "API Logic Project: ...) to the customer for each one.'"}]
+
+messages- old
+[{'role': 'system', 'content': 'You are an API planner that converts natural language queries into MCP Tool Context blocks using JSON:API. Return only the tool context as JSON.'}, {'role': 'user', 'content': 'Schema:\n{"base_url": "http://localhost:5656/api", "description": "API Logic Project: basic_demo", "email_services": "iff email is requested, Send email by issing a POST request to the Email endpoint, setting the subject, message and customer_id in the body.", "expected_response": "Respond with a JSON object with schema_version and a resource array including: tool_type, base_url, path, method, query_params array or body, headers.", "query_params": "- JSON:API custom filtering using a filter array (e.g., filter=[{\\"name\\":\\"date_shipped\\",\\"op\\":\\"gt\\",\\"val\\":\\"2023-07-14\\"}])", "resources": [{"fields": ["id", "name", "balance", "credit_limit"], "filterable": ["id", "name", "balance", "credit_limit"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Customer", "path": "/Customer"}, {"fields": ["id", "order_id", "product_id", "quantity", "amount", "unit_price"], "filterable": ["id", "order_id", "product_id", "quantity", "amount", "unit_price"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Item", "path": "/Item"}, {"fields": ["id", "notes", "customer_id", "date_shipped", "amount_total"], "filterable": ["id", "notes", "customer_id", "date_shipped", "amount_total"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Order", "path": "/Order"}, {"fields": ["id", "name", "unit_price"], "filterable": ["id", "name", "unit_price"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Product", "path": "/Product"}, {"fields": ["id", "request", "request_prompt", "completion"], "filterable": ["id", "request", "request_prompt", "completion"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Mcp", "path": "/Mcp"}], "schema_version": "1.0", "tool_type": "json-api"}\n\nNatural language query: \'List the unshipped orders created before 2023-07-14, and send a discount email (subject: \'Discount Offer\') to the customer for each one.\''}]
+
+old content
+'Schema:\n{"base_url": "http://localhost:5656/api", "description": "API Logic Project: basic_demo", "email_services": "iff email is requested, Send email by issing a POST request to the Email endpoint, setting the subject, message and customer_id in the body.", "expected_response": "Respond with a JSON object with schema_version and a resource array including: tool_type, base_url, path, method, query_params array or body, headers.", "query_params": "- JSON:API custom filtering using a filter array (e.g., filter=[{\\"name\\":\\"date_shipped\\",\\"op\\":\\"gt\\",\\"val\\":\\"2023-07-14\\"}])", "resources": [{"fields": ["id", "name", "balance", "credit_limit"], "filterable": ["id", "name", "balance", "credit_limit"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Customer", "path": "/Customer"}, {"fields": ["id", "order_id", "product_id", "quantity", "amount", "unit_price"], "filterable": ["id", "order_id", "product_id", "quantity", "amount", "unit_price"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Item", "path": "/Item"}, {"fields": ["id", "notes", "customer_id", "date_shipped", "amount_total"], "filterable": ["id", "notes", "customer_id", "date_shipped", "amount_total"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Order", "path": "/Order"}, {"fields": ["id", "name", "unit_price"], "filterable": ["id", "name", "unit_price"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Product", "path": "/Product"}, {"fields": ["id", "request", "request_prompt", "completion"], "filterable": ["id", "request", "request_prompt", "completion"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Mcp", "path": "/Mcp"}], "schema_version": "1.0", "tool_type": "json-api"}\n\nNatural language query: \'List the unshipped orders created before 2023-07-14, and send a discount email (subject: \'Discount Offer\') to the customer for each one.\''
+
+where new content looks correct:
+'Schema:\n{"base_url": "http://localhost:5656/api", "description": "API Logic Project: basic_demo", "email_services": "iff email is requested, Send email by issing a POST request to the Email endpoint, setting the subject, message and customer_id in the body.", "expected_response": "Respond with a JSON object with schema_version and a resource array including: tool_type, base_url, path, method, query_params array or body, headers.", "query_params": "- JSON:API custom filtering using a filter array (e.g., filter=[{\\"name\\":\\"date_shipped\\",\\"op\\":\\"gt\\",\\"val\\":\\"2023-07-14\\"}])", "resources": [{"fields": ["id", "name", "balance", "credit_limit"], "filterable": ["id", "name", "balance", "credit_limit"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Customer", "path": "/Customer"}, {"fields": ["id", "order_id", "product_id", "quantity", "amount", "unit_price"], "filterable": ["id", "order_id", "product_id", "quantity", "amount", "unit_price"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Item", "path": "/Item"}, {"fields": ["id", "notes", "customer_id", "date_shipped", "amount_total"], "filterable": ["id", "notes", "customer_id", "date_shipped", "amount_total"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Order", "path": "/Order"}, {"fields": ["id", "name", "unit_price"], "filterable": ["id", "name", "unit_price"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Product", "path": "/Product"}, {"fields": ["id", "request", "request_prompt", "completion"], "filterable": ["id", "request", "request_prompt", "completion"], "methods": ["GET", "PATCH", "POST", "DELETE"], "name": "Mcp", "path": "/Mcp"}], "schema_version": "1.0", "tool_type": "json-api"}\n\nNatural language query: \'List the unshipped orders created before 2023-07-14, and send a discount email (subject: \'Discount Offer\') to the customer for each one.\''