ApiLogicServer 15.0.0__py3-none-any.whl → 15.0.9__py3-none-any.whl

api_logic_server_cli/prototypes/basic_demo/customizations/logic/logic_discovery/mcp_client_executor_request.py

@@ -1,279 +1,17 @@
 """ 
-This simulates the MCP Client Executor, 
-which takes a natural language query and converts it into a tool context block:
-
-1. Discovers MCP servers (from config)
-2. Queries OpenAI's GPT-4 model to obtain the tool context based on a provided schema and a natural language query
-3. Processes the tool context (calls the indicated MCP (als) endpoints)
-
-Notes:
-* See: integration/mcp/README_mcp.md
-* python api_logic_server_run.py
-
+Invokes MCP client executor to process MCP requests when a new SysMcp row is inserted.
 """
 
 import json
-import os, sys
+import os, logging
 from typing import Dict, List
 import openai
 import requests
-from logic_bank.exec_row_logic.logic_row import LogicRow
 from logic_bank.logic_bank import Rule
+from logic_bank.exec_row_logic.logic_row import LogicRow
 from database import models
 from logic_bank.util import ConstraintException
-
-# Set your OpenAI API key
-openai.api_key = os.getenv("APILOGICSERVER_CHATGPT_APIKEY")
-
-server_url = os.getenv("APILOGICSERVER_URL", "http://localhost:5656/api")
-
-# debug settings
-test_type = 'orchestration'  # 'simple_get' or 'orchestration'
-create_tool_context_from_llm = True
-''' set to False to bypass LLM call and save 2-3 secs in testing '''
-use_test_schema = False
-''' True means bypass discovery, use hard-coded schedma file '''
-
-def discover_mcp_servers():
-    """ Discover the MCP servers by calling the /api/.well-known/mcp.json endpoint.
-    This function retrieves the list of available MCP servers and their capabilities.
-    """
-    global server_url, use_test_schema
-
-    # create schema_text (for prompt), by reading integration/mcp/mcp_schema.txt
-
-    # find the servers - read the mcp_server_discovery.json file
-    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"\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:
-        print(f"Error decoding JSON from {discovery_file_path}: {e}")
-    
-    for each_server in discovery_data["servers"]:
-        discovery_url = each_server["schema_url"]
-
-        # Call the discovery_url to get the MCP/API schema
-        try:
-            response = requests.get(discovery_url)
-            if response.status_code == 200:
-                api_schema = response.json()
-                print()
-                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:
-            print(f"Error calling OpenAPI URL: {e}")
-    return json.dumps(api_schema)
-
-
-def get_user_nl_query_and_training(query: str):
-    """ Get the natural language query from the user. 
-    Add training for the LLM to generate a tool context block.
-    
-    """
-
-    global test_type
-    # 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:
-        training_prompt = ""
-        print(f"Prompt file not found at {prompt_file_path}.")
-    return query + "\n\n" + training_prompt
-
-
-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.
-
-    It handles both orchestration and simple GET requests.
-    """
-
-    global test_type, create_tool_context_from_llm
-
-    content = f"Natural language query:\n {nl_query}\nSchema:\n{schema_text}"
-    messages = [
-        {
-            "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": f"{content}"
-        }
-    ]
-
-    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,
-          temperature=0.2
-      )
-
-      tool_context_str = response.choices[0].message.content
-      tool_context_str_no_cr = tool_context_str.replace("\n", '')  # convert single quotes to double quotes
-      try:
-          tool_context = json.loads(tool_context_str_no_cr)
-      except json.JSONDecodeError:
-          print("Failed to decode JSON from response:", tool_context_str)
-          return None
-
-    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 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.
-
-    Research: 
-
-    1. How is this a "USB", since the request was specific about JSON:API?
-    2. How is it clear to loop through the tool_context[0] and call tool_context[1]?
-    """
-    global server_url
-
-    def get_query_param_filter(query_params):
-        """ return json:api filter
-
-        eg
-            curl -qg 'http://localhost:5656/api/Order?filter=[{"name":"date_shipped","op":"eq","val":null},{"name":"CreatedOn","op":"lt","val":"2023-07-14"}]'
-
-            curl -qg 'http://localhost:5656/api/Order?filter=[{"name":"date_shipped","op":"gt","val":"2023-07-14"}]'
-            curl -qg 'http://localhost:5656/api/Order?filter=[{"name":"date_shipped","op":"eq","val":null}]'
-            curl -qg 'http://localhost:5656/api/Customer?filter=[{"name":"credit_limit","op":"gt","val":"1000"}]'
-        
-        query_params might be simple:
-            "query_params": [ {"name": "credit_limit", "op": "gt", "val": "1000"} ]
-            ==> ?filter=[{"name":"credit_limit","op":"gt","val":"1000"}]
-
-        or a list:
-            "query_params": [
-                {
-                    "name": "date_shipped",
-                    "op": "eq",
-                    "val": None
-                },
-                {
-                    "name": "date_created",
-                    "op": "lt",
-                    "val": "2023-07-14"
-                }
-            ],
-
-        """
-
-        added_rows = 0
-
-        query_param_filter = ''
-        assert isinstance(query_params, list), "Query Params filter expected to be a list"
-        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 "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('"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 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 = 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 = each_block["base_url"] + each_block["path"]
-                        json_update_data =  { 'data': {"type": each_block["path"][1:], 'attributes': {} } }  
-                        json_update_data_attributes = json_update_data["data"]["attributes"]
-                        move_fields( src= each_block["body"], dest=json_update_data_attributes, context_data=each_order) 
-                        # eg: POST http://localhost:5656/api/SysEmail {'data': {'type': 'SysEmail', '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:
-                            headers.update(each_block["headers"])
-                        mcp_response = requests.post(  
-                            url=url,
-                            headers=headers,
-                            json=json_update_data
-                        )
-                        added_rows += 1
-        pass
-    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 
-
+import integration.mcp.mcp_client_executor as mcp_client_executor
 
 
 def declare_logic():
@@ -289,30 +27,21 @@ def declare_logic():
     """
 
 
-    def mcp_client_executor(row: models.SysMcp, old_row: models.SysMcp, logic_row: LogicRow):
+    def mcp_client_executor_event(row: models.SysMcp, old_row: models.SysMcp, logic_row: LogicRow):
         """ 
 
         #als: create an MCP request.  See https://apilogicserver.github.io/Docs/Integration-MCP/
 
         Test:
-        * `curl -X 'POST' 'http://localhost:5656/api/SysMcp/' -H 'accept: application/vnd.api+json' -H 'Content-Type: application/json' -d '{ "data": { "attributes": {"request": "List the orders date_shipped is null and CreatedOn before 2023-07-14, and send a discount email (subject: '\''Discount Offer'\'') to the customer for each one."}, "type": "SysMcp"}}'`
-        * Or, use the Admin App and insert a row into SysMCP (see `query_example`, below)
+        * curl -X 'POST' 'http://localhost:5656/api/SysMcp/' -H 'accept: application/vnd.api+json' -H 'Content-Type: application/json' -d '{ "data": { "attributes": {"request": "List the orders date_shipped is null and CreatedOn before 2023-07-14, and send a discount email (subject: '\''Discount Offer'\'') to the customer for each one."}, "type": "SysMcp"}}'
+        * Or, use the Admin App and insert a row into SysMCP, eg:
+            * List the orders date_shipped is null and CreatedOn before 2023-07-14, and send a discount email (subject: 'Discount Offer') to the customer for each one."
 
         Args:
-            row (Mcp): inserted MCP with prompt
+            row (Mcp): inserted SysMcp with prompt
             old_row (Mcp): n/a
             logic_row (LogicRow): bundles curr/old row, with ins/upd/dlt logic
         """
-        schema_text = discover_mcp_servers()                    # see: 1-discovery-from-als
-
-        query_example = "List the orders date_shipped is null and CreatedOn before 2023-07-14, and send a discount email (subject: 'Discount Offer') to the customer for each one."
-        query = row.request
-        prompt = get_user_nl_query_and_training(query)
-
-        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
-
-        print("\nTest complete.\n")
+        result = mcp_client_executor.mcp_client_executor(row.request)
 
-    Rule.row_event(on_class=models.SysMcp, calling=mcp_client_executor)  # see above
+    Rule.row_event(on_class=models.SysMcp, calling=mcp_client_executor_event)  # see above

api_logic_server_cli/prototypes/basic_demo/customizations/ui/admin/admin.yaml

@@ -131,13 +131,13 @@ resources:
     user_key: id
   SysMcp:
     attributes:
+    - name: request
+      type: textarea
     - label: ' id*'
       name: id
       search: true
       sort: true
-    - name: request
-    - name: request_prompt
-    - name: completion
+      show_when: isInserting == false
     type: SysMcp
     user_key: id
 settings:

api_logic_server_cli/prototypes/basic_demo/customizations/ui/admin/home.js

@@ -0,0 +1,48 @@
+const sla_doc =
+    '<div class="MuiTypography-root jss4" style="color: rgba(0, 0, 0, 0.66)">' +
+    '<div style="text-align:center">' +
+    '<h2>Welcome to API Logic Server</h2>' +
+    '</div><br>' +
+    '<h3><a class="custom" style="color: #3f51b5;"  rel="nofollow" href="https://apilogicserver.github.io/Docs/" target="_blank">API Logic Server</a> ' +
+    'creates <i>customizable</i> model-driven systems, instantly from your ' +
+    'database:' +
+    '</h3>' +
+    '<h4>1. Automatic Admin App</h4>' +
+    '<ul>' +
+    '   <li>For instant collaboration and Back Office data maintenance</li>' +
+    '   <li>Rich functionality: multi-page, multi-table</li>' +
+    '   <li>Explore this Admin App, ' +
+    '        and how to <a class="custom" style="color: #3f51b5" rel="nofollow" href="https://apilogicserver.github.io/Docs/Admin-Customization/" target="_blank">customize it</a></li>' +
+    '</ul>' +
+    '<h4>2. API, with <a class="custom" style="color: #3f51b5;"  rel="nofollow" href="/api" target="_blank">oas/Swagger</a></h4>' +
+    '<ul>' +
+    '   <li>For custom app dev, integration</li>' +
+    '   <li>Rich functionality: endpoint for each table, with filtering, pagination, related data</li>' +
+    '   <li><a class="custom" style="color: #3f51b5" rel="nofollow" href="https://apilogicserver.github.io/Docs/API-Customize/" target="_blank">Customizable</a>: add your own endpoints</li>' +
+    '   <li><a class="custom" style="color: #3f51b5" rel="nofollow" href="http://localhost:5656/stop" target="_blank">Stop</a> the server</li>' +
+    '</ul>' +
+    '<h4>3. Business Logic, for <span class="JoinedField" title="Often nearly half the app -- automation required"><span>backend processing</span> </span></h4>' +
+    '<ul>' +
+    '   <li>Spreadsheet-like rules for multi-table derivations and constraints</li>' +
+    '   <li>Extensible with Python events for email, messages, etc</li>' +
+    '   <li><a class="custom" style="color: #3f51b5" rel="nofollow" href="https://apilogicserver.github.io/Docs/Logic-Why/" target="_blank">Explore</a> ' +
+    '       how logic can meaningfully improve ' +
+    '       <a class="custom" style="color: #3f51b5" rel="nofollow" href="https://github.com/valhuber/LogicBank/wiki/by-code" title="Rules are 40X more concise than code, and address over 95% of database logic" target="_blank">conciseness</a> ' +
+    '       and quality</li>' +
+    '</ul>' +
+    '<h4>4. MCP-enabled, to <span class="JoinedField" title="Often nearly half the app -- automation required"><span>Enable Bus Users to use Natural Language to create multi-step execution flows</span> </span></h4>'+
+    '<ul>' +
+    '   <li>For more information, <a class="custom" style="color: #3f51b5" rel="nofollow" href="https://apilogicserver.github.io/Docs/Integration-MCP/" target="_blank">Click here</a></li>' +
+    '   <li>Create a new SysMcp, and enter: List the orders date_shipped is null and CreatedOn before 2023-07-14, and send a discount email (subject: \'Discount Offer\') to the customer for each one.</li>' +
+    '</ul>' +
+    '</div>'
+
+
+function getContent(){
+
+    let result = '<button class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-widget-159 MuiButton-textPrimary" tabindex="0" type="button" ><span class="MuiButton-label">Loaded External Component. </span></button>';
+    result = ""
+    result += sla_doc;
+    return result;
+}
+

api_logic_server_cli/prototypes/manager/system/genai/mcp_learning/mcp.prompt

@@ -1,3 +1,15 @@
+To issue one request per row from a prior step (fan-out), use the syntax:
+
+"$<stepIndex>[*].<fieldName>"
+
+For example, if step 0 returns orders, and you want to send a POST per customer:
+
+Before (incorrect):
+    "customer_id": "{customer_id}"
+
+After (correct):
+    "customer_id": "$0[*].customer_id"
+    
 Only if 'email' is in the Natural language query, send email by issing a POST request to the SysEmail endpoint, setting the subject, message and customer_id in the body.   DO NOT include a POST unless the word ‘email’ appears in the user query.
 
 Format response as mcp_responseFormat.

{apilogicserver-15.0.0.dist-info → apilogicserver-15.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ApiLogicServer
-Version: 15.0.0
+Version: 15.0.9
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://www.genai-logic.com

{apilogicserver-15.0.0.dist-info → apilogicserver-15.0.9.dist-info}/RECORD

@@ -1,19 +1,19 @@
 api_logic_server_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_logic_server_cli/api_logic_server.py,sha256=JGttj16Oh5RYnnl5vT6AFWZDa3JQJAAZWrzXW0jK0Lc,96093
-api_logic_server_cli/api_logic_server_info.yaml,sha256=gry1dTWvFjC4Uj6p2hm6zI9z1_MGnigzFXxFj-QFO40,167
+api_logic_server_cli/api_logic_server.py,sha256=sPlwuJ-5alty2QKGWQzrQI-5TanLowp6LlzaCOf3mTs,96233
+api_logic_server_cli/api_logic_server_info.yaml,sha256=7dgxLMqOLurpP0UFLsdB_Xm7EfOjSwmcjr8DJYc3osU,128
 api_logic_server_cli/cli.py,sha256=AT1cWszOygHWIbpxDoXFhaTeSai3Tf5SbGoXvN4h510,83134
 api_logic_server_cli/cli_args_base.py,sha256=lr27KkOB7_WpZwTs7LgiK8LKDIHMKQkoZCTnE99BFxw,3280
 api_logic_server_cli/cli_args_project.py,sha256=I5no_fGRV_ZsK3SuttVDAaQYI4Q5zCjx6LojGkM024w,4645
 api_logic_server_cli/extended_builder.py,sha256=EhtXGAt_RrDR2tCtgvc2U82we7fr-F6pP-e6HS6dQWQ,13867
 api_logic_server_cli/logging.yml,sha256=isWhKviFwJwYgjIUejfhUxcMli2zEbZeQbEvVhNk_4Y,1812
 api_logic_server_cli/manager.py,sha256=pLBJkGYhSFBifW97D162WWqA1UDoIwEXH7A6nBK4j1Y,11048
-api_logic_server_cli/add_cust/add_cust.py,sha256=aVadUVtKyNuWNbPjTcP1AEeavTQEVkZpOYyFBAGjjvw,13330
+api_logic_server_cli/add_cust/add_cust.py,sha256=ZRmCr62ljocGuiMgplFhpLMFfLJrqsGo7KX0-zKZx-U,14046
 api_logic_server_cli/create_from_model/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 api_logic_server_cli/create_from_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_logic_server_cli/create_from_model/api_expose_api_models_creator.py,sha256=V-u3Hm404doztw66YuD2A043RCFmtw5QF5tMioC_1b0,7900
 api_logic_server_cli/create_from_model/api_logic_server_utils.py,sha256=G5ifhuR8OIujUHoklZ-XZyowCpUGKJrkLuyB9sSEf34,26728
 api_logic_server_cli/create_from_model/create_db_from_model.py,sha256=2H7slGnk39XOSnvL7vxrg6Ewx4bxeBJBgLo8fcXHTB4,4382
-api_logic_server_cli/create_from_model/dbml.py,sha256=Ef23JIB4IuPsef-QrJ2LTfiKBGRr2ddNSS6RWEh7sKs,11489
+api_logic_server_cli/create_from_model/dbml.py,sha256=UKBIXUDGgm0yk0GefBB6Nu3FDwHf_daYV6qfPM0716U,11557
 api_logic_server_cli/create_from_model/meta_model.py,sha256=ERf7tSgnSJSeRMVyggkdg-lvORQZSbfK0KMpL63qSEY,5837
 api_logic_server_cli/create_from_model/model_creation_services.py,sha256=B86ljgUR98H_dCaxqiw-flrbvc05-XXtkC5It2BSezs,41479
 api_logic_server_cli/create_from_model/ont_build.py,sha256=5BcmM0xW-0vjr9J_u1o0_3joLfKhcLeDWP31dcy5dzI,67028
@@ -24,7 +24,7 @@ api_logic_server_cli/create_from_model/__pycache__/__init__.cpython-312.pyc,sha2
 api_logic_server_cli/create_from_model/__pycache__/api_expose_api_models_creator.cpython-312.pyc,sha256=3wtCiVHOjOgIonZOgnCsF2p01zcXIapx1_Tq2LwzY6Q,6989
 api_logic_server_cli/create_from_model/__pycache__/api_logic_server_utils.cpython-312.pyc,sha256=Qa-lL19TM5dAwMgVmT6ld7iB_Bb7RR0oYpEzlC2UmHM,27403
 api_logic_server_cli/create_from_model/__pycache__/create_db_from_model.cpython-312.pyc,sha256=5eE8pIEa-OoUOk0xn_b78cCc9dSmxjTMn3HGJbxbFY4,4799
-api_logic_server_cli/create_from_model/__pycache__/dbml.cpython-312.pyc,sha256=TK55yhQ53rEetYDm89ztvEIDPLnjMuYQ5_kJqaCio9I,12671
+api_logic_server_cli/create_from_model/__pycache__/dbml.cpython-312.pyc,sha256=gJsMCXlkMupUzNYYqecR5sX9prwmZfo3TpzqssSKh3Y,12671
 api_logic_server_cli/create_from_model/__pycache__/meta_model.cpython-312.pyc,sha256=BH5Cflj8YKf0CVkHpIZ_3eBbHXhwIWbwsrzM7DsEikE,7098
 api_logic_server_cli/create_from_model/__pycache__/model_creation_services.cpython-312.pyc,sha256=_pJPTvkJL22Eu1BWM48VfXcyapD366OnXBqHGn-wtO0,36462
 api_logic_server_cli/create_from_model/__pycache__/ont_build.cpython-312.pyc,sha256=Hni6k7GidAkkz-YO2kvmQOMYdCdCWvGWxX3HIPjj1eE,75285
@@ -478,7 +478,7 @@ api_logic_server_cli/genai/genai.py,sha256=rt4XW_xmo-D5fLD8DQBHMjrU7Teflw43S8lR-
 api_logic_server_cli/genai/genai_fatal_excp.py,sha256=1FmDVcXVRqmG0JMVZ7l4KqMOdpff3KGZ2LPAGtw304Q,179
 api_logic_server_cli/genai/genai_graphics.py,sha256=RVLbcHoERS7F2l3WiwKrJkn3VnhQ07A-1ru55IvS4dU,20610
 api_logic_server_cli/genai/genai_logic_builder.py,sha256=u_89UtrALIfcMtW6p0SZ78lCmwRqerA5igyY2hDvjlk,26150
-api_logic_server_cli/genai/genai_svcs.py,sha256=yb-3a9Hizs8ZV9LGJTrHKQW_an3ESJrrNIRqyFszv2A,48449
+api_logic_server_cli/genai/genai_svcs.py,sha256=6qHNj-17S2bkIm8F1nCFGzudLSViTP2WgP_XkAATQf0,48578
 api_logic_server_cli/genai/genai_utils.py,sha256=DTlWTnW5_2pzX4q1VG1tWqoZPVObDHR97SVe0z8Z3rs,17102
 api_logic_server_cli/genai/json2rules.py,sha256=ykoxxgZgqllzt8Ud06S-R_3QtumxXfmF5ksYC0Hh2Sk,2645
 api_logic_server_cli/model_migrator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -536,7 +536,7 @@ api_logic_server_cli/prototypes/base/api/expose_api_models.py,sha256=XhmZe_8Hnup
 api_logic_server_cli/prototypes/base/api/json_encoder.py,sha256=3EFDSi9jdaS4jSOs5EwyltWwTy-8QEoBN2afYknpCdQ,521
 api_logic_server_cli/prototypes/base/api/readme_customize_api.md,sha256=AEeBybDsXSDr2IlqGZCo17ZModZnrflAOCx2a6gP_rE,4165
 api_logic_server_cli/prototypes/base/api/api_discovery/auto_discovery.py,sha256=y6uQ_i9t8qqmjsM69rZzzp2q3OaAbSrwlfeRIrR_sRY,1099
-api_logic_server_cli/prototypes/base/api/api_discovery/mcp_discovery.py,sha256=fKNJ4dXhnnSVmkSVyvkP5T8NyGRZEOd_z6UdFcnDaWU,2078
+api_logic_server_cli/prototypes/base/api/api_discovery/mcp_discovery.py,sha256=4hXYBCg_3XP2mJ_UJFnxyI7agN_TCUEuOSmf_w29vDw,4088
 api_logic_server_cli/prototypes/base/api/api_discovery/new_service.py,sha256=xe2AAFvpQwjrwwGAXs4pdZ8dWtcqAJ5KKYL_QKyqvGg,638
 api_logic_server_cli/prototypes/base/api/api_discovery/newer_service.py,sha256=p1ah8Pj2kjuTIlktYrtvdiuzGUEaPy7qLa7Cvu0GgbA,659
 api_logic_server_cli/prototypes/base/api/api_discovery/ontimize_api.py,sha256=_gNyxbx6ExbrCy3uzz8JzBBDZRxPyHoyRH7vJRqV1NM,20340
@@ -553,9 +553,9 @@ api_logic_server_cli/prototypes/base/config/activate_logicbank.py,sha256=IuDe3uW
 api_logic_server_cli/prototypes/base/config/config.py,sha256=SMkt_SmMFfQ1g9a9wG0bZNM7yUsRANxFCz2EFWs-WeY,30879
 api_logic_server_cli/prototypes/base/config/default.env,sha256=-rjXJrjR4vjMr9YCVYVchaJw7qMBlbvQ3KfR_wri_XM,412
 api_logic_server_cli/prototypes/base/config/logging-reduced.yml,sha256=N-BDIk0t5uAmw3Of_d_ueK4jx7pxNwlYbkiDd1wjRDs,2179
-api_logic_server_cli/prototypes/base/config/logging.yml,sha256=qMPyWipCWukb2qFyf18E9QCgGirob9jNDcx64PNqAdI,2330
+api_logic_server_cli/prototypes/base/config/logging.yml,sha256=Rj7lwLAQ1fiP5al5KZxL8f5CXuICpGJDuJiLJbqcQTE,2426
 api_logic_server_cli/prototypes/base/config/mypy.ini,sha256=2jL3ZtXg9SmJZu6zVQS_hmvO8wyVF1a1JWcVZplXLEk,568
-api_logic_server_cli/prototypes/base/config/server_setup.py,sha256=rFwYNJe-QGpk7g_io2HjkpED0w1hSNkW8zWwG-ptFDA,15345
+api_logic_server_cli/prototypes/base/config/server_setup.py,sha256=tku0B4O4du554_aVFBXpCgAaEDMaOEVO7cn0spwHpJc,18340
 api_logic_server_cli/prototypes/base/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_logic_server_cli/prototypes/base/database/alembic.ini,sha256=N-xPrNv1gfMB8ylxm8pprtQxjwlv_9vTUSYGXnaWMnA,3027
 api_logic_server_cli/prototypes/base/database/authentication_db.sqlite,sha256=hA71uBnrh2PVQw9YLc-YbsXjpxr2VyvfE-OhF_ssE6w,45056
@@ -630,11 +630,13 @@ api_logic_server_cli/prototypes/base/integration/kafka/kafka_consumer.py,sha256=
 api_logic_server_cli/prototypes/base/integration/kafka/kafka_producer.py,sha256=g0nMAVfz1Y0iKJbbXfvRpdf-QUmyB4uUGZ6lyaVoXag,4470
 api_logic_server_cli/prototypes/base/integration/kafka/kafka_readme.md,sha256=MlwykHWM2w41KzWh4vPuTnIodR8f-BQzrWpV4P1hrsI,161
 api_logic_server_cli/prototypes/base/integration/mcp/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
-api_logic_server_cli/prototypes/base/integration/mcp/README_mcp.md,sha256=ZXLgtvqQCcGouxFE_7pu6OA3Qu1Qm3Jh-gcQxuFKb_w,1216
-api_logic_server_cli/prototypes/base/integration/mcp/mcp_client_executor.py,sha256=Y0kQy4oMuBhCfhZxlfm5qPVXVObjOULatpJ2lIc9qJQ,12926
-api_logic_server_cli/prototypes/base/integration/mcp/mcp_schema.txt,sha256=qmov7e0NdYiQTCxNJU2xzxf9HnYeXFej-c8GSB-y6MM,1143
+api_logic_server_cli/prototypes/base/integration/mcp/mcp_client_executor.py,sha256=w3H6rVgveFg_ZgQNYSb-h1BcLnLF2W45owmWKOMovXg,6559
 api_logic_server_cli/prototypes/base/integration/mcp/mcp_server_discovery.json,sha256=TUyInb67AWoGw7XFE9iDZxmM8UEID-ahQmdmzpF9AmQ,188
-api_logic_server_cli/prototypes/base/integration/mcp/test_notes.txt,sha256=71Qqw7FRVGtEoHCxlGRPpaizvBh1L-X-MTOwkZ6CY3A,11126
+api_logic_server_cli/prototypes/base/integration/mcp/examples/mcp_discovery_response.json,sha256=f1RP5kuTU8rkqxWsZoATBF8xdaVEgPTaB4MRoExIF-Q,3763
+api_logic_server_cli/prototypes/base/integration/mcp/examples/mcp_request.prompt,sha256=vmt_fvwOK-C2fnI1LLUMe5WbLk6qxv2RdVJkBUTo9zM,2601
+api_logic_server_cli/prototypes/base/integration/mcp/examples/mcp_schema.txt,sha256=qmov7e0NdYiQTCxNJU2xzxf9HnYeXFej-c8GSB-y6MM,1143
+api_logic_server_cli/prototypes/base/integration/mcp/examples/mcp_tool_context_response.json,sha256=N1bzqc5JMQ7j12ThVuJ-6D8w9ZSmo5c3P0eThd-Q2Mo,1012
+api_logic_server_cli/prototypes/base/integration/mcp/examples/mcp_tool_context_response_get.json,sha256=SDh8CkbL_fRGS7dDwcTofMlPziIu8Ycdests-jAeG6w,419
 api_logic_server_cli/prototypes/base/integration/n8n/N8N_WebHook_from_ApiLogicServer.json,sha256=s9JuoF9gLiuNZAD0dTVdnwQpORQHe0TseyPNVDe048w,10606
 api_logic_server_cli/prototypes/base/integration/n8n/n8n_producer.py,sha256=LuMec7HNwjaCsyMQSTTRpx9tW6l3OiV1StWrnahJBPA,7314
 api_logic_server_cli/prototypes/base/integration/n8n/n8n_readme.md,sha256=8RisYrm8ORUbtu-Duis19DJTBMGW32LymWYZN9A0pF0,3130
@@ -699,27 +701,19 @@ api_logic_server_cli/prototypes/base/venv_setup/venv.ps1,sha256=_-LfKkLw5HOkZsF5
 api_logic_server_cli/prototypes/base/venv_setup/venv.sh,sha256=aWX9fa8fe6aO9ifBIZEgGY5UGh4I0arOoCwBzDsxgU8,893
 api_logic_server_cli/prototypes/basic_demo/README.md,sha256=QHVOtJq7A_9RtTwrrecbbYbdBf3buxkhBgPpX342wAA,18685
 api_logic_server_cli/prototypes/basic_demo/customizations/api/.DS_Store,sha256=6F7pphfwiMhILhl_J6yVhDZFYXmar5V92iLCzSkfnyA,6148
-api_logic_server_cli/prototypes/basic_demo/customizations/api/api_discovery/mcp_discovery.py,sha256=YBgu5EOzrNhhdIPLUN4mplAy5WCy_KodK7LCMZlz6xk,3748
 api_logic_server_cli/prototypes/basic_demo/customizations/api/api_discovery/openapi.py,sha256=kLQ7Fn1J7tzuNJHBXF2AiwtzvQ-0JxJ6z-MfFryAtLk,3887
 api_logic_server_cli/prototypes/basic_demo/customizations/config/default.env,sha256=-rjXJrjR4vjMr9YCVYVchaJw7qMBlbvQ3KfR_wri_XM,412
-api_logic_server_cli/prototypes/basic_demo/customizations/config/server_setup.py,sha256=bV48ou0jSEm2o5yhTVgms1w7rqU9Ccf_2yfZip3ivJk,15441
 api_logic_server_cli/prototypes/basic_demo/customizations/database/db.sqlite,sha256=wfrMPS1h9bq5hT0u901p2FjlGIFZsKZkTy77tzrkzsM,28672
 api_logic_server_cli/prototypes/basic_demo/customizations/database/models.py,sha256=sg-ihsH386778vf2DtW0edzf8oCqDVp1NCqhyWXAbLw,4895
 api_logic_server_cli/prototypes/basic_demo/customizations/database/system/SAFRSBaseX.py,sha256=VeiUgXr9pkgvxchCf89lhRKNBlfj4_FYwAweu3NWj-M,5394
-api_logic_server_cli/prototypes/basic_demo/customizations/integration/mcp/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
-api_logic_server_cli/prototypes/basic_demo/customizations/integration/mcp/README_mcp.md,sha256=ZXLgtvqQCcGouxFE_7pu6OA3Qu1Qm3Jh-gcQxuFKb_w,1216
-api_logic_server_cli/prototypes/basic_demo/customizations/integration/mcp/Zmcp_client_executor.py,sha256=wLjr6RDFpweCMCItno5OGUgNaMDYkYIBtwc7sUqNAG4,12945
-api_logic_server_cli/prototypes/basic_demo/customizations/integration/mcp/mcp_schema.txt,sha256=qmov7e0NdYiQTCxNJU2xzxf9HnYeXFej-c8GSB-y6MM,1143
-api_logic_server_cli/prototypes/basic_demo/customizations/integration/mcp/mcp_server_discovery.json,sha256=TUyInb67AWoGw7XFE9iDZxmM8UEID-ahQmdmzpF9AmQ,188
-api_logic_server_cli/prototypes/basic_demo/customizations/integration/mcp/mcp_tool_context.json,sha256=UB25uyOO5Jnx5k5Sxe7c8MQxc6V0R1FsA4HhpHoKgw4,846
-api_logic_server_cli/prototypes/basic_demo/customizations/integration/mcp/test_notes.txt,sha256=71Qqw7FRVGtEoHCxlGRPpaizvBh1L-X-MTOwkZ6CY3A,11126
 api_logic_server_cli/prototypes/basic_demo/customizations/logic/cocktail-napkin.jpg,sha256=5rNSy6wvcWSHPJQZqkf2DHs19QLWiyqMBNwxGqjstZU,133075
 api_logic_server_cli/prototypes/basic_demo/customizations/logic/declare_logic.py,sha256=Yk-X017gZM1egx4MXSx_FGURj4KDqJfpq1NWVFrwfEY,4612
 api_logic_server_cli/prototypes/basic_demo/customizations/logic/logic_discovery/email_request.py,sha256=3UnBUBpHSThHHRLLJuV-sgRAs6sS-UCzsTjBzf0onns,1851
-api_logic_server_cli/prototypes/basic_demo/customizations/logic/logic_discovery/mcp_client_executor_request.py,sha256=4v1HOZQRPZCMUeb5_QmMfqMvDr-pmcPfgalWsS1KSQg,14243
+api_logic_server_cli/prototypes/basic_demo/customizations/logic/logic_discovery/mcp_client_executor_request.py,sha256=TkruzfnJ53HclWcPTx69du-XsRRAk6O67RsQkCJgUu4,2062
 api_logic_server_cli/prototypes/basic_demo/customizations/logic/logic_discovery/simple_constraints.py,sha256=4HRLOXuLJP1eOosONeEtpA9DehxiZME0-FBKuG1RaI0,760
 api_logic_server_cli/prototypes/basic_demo/customizations/security/declare_security.py,sha256=gbdH29cPY656lgROPm_w20Q-g6AhlIMES3wiIrqBTdk,2439
-api_logic_server_cli/prototypes/basic_demo/customizations/ui/admin/admin.yaml,sha256=y3goVMcxMN4wNLQh4kNJvYuSzpntECeDjwLQF2c1YI4,3494
+api_logic_server_cli/prototypes/basic_demo/customizations/ui/admin/admin.yaml,sha256=PynSqW6qUh5JcRJKkgX-aSv8GjmCXxBflBTzRVTa0R0,3503
+api_logic_server_cli/prototypes/basic_demo/customizations/ui/admin/home.js,sha256=0YSOlZAyhYOm7eKSVRMspzEc_P7PO-lRaUurYGCqQ10,3371
 api_logic_server_cli/prototypes/basic_demo/iteration/api/api_discovery/order_b2b.py,sha256=hg9Bsz0_t-RjO9rFcW-YH3y26kq4IY5dd9FfVoYxB4w,3176
 api_logic_server_cli/prototypes/basic_demo/iteration/database/db.sqlite,sha256=QsU34YuKT_YjPF-v6vDtcNJWV6AV2mspqAqW1VoMH5M,28672
 api_logic_server_cli/prototypes/basic_demo/iteration/docs/er_diagram.png,sha256=-3aSv9ay7XeFqGU-cygRz5T5eYhY627BYmA6GXdUYH0,161072
@@ -5651,7 +5645,7 @@ api_logic_server_cli/prototypes/manager/system/genai/graphics_templates/html_tem
 api_logic_server_cli/prototypes/manager/system/genai/graphics_templates/index.html,sha256=rTl5u1AtZRIBSxK4aANBRaJK3GZOML6eiVp6Tf_2LkI,567
 api_logic_server_cli/prototypes/manager/system/genai/graphics_templates/sales_by_region.jinja,sha256=k93hwOF2KslZEWw31wIobVPdbigsjNUkRWsjec2DdbM,1848
 api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.prompt,sha256=1rBJy-rUHPx9YepSZH9niQocGbxtpbGyX2QmDxVsFd0,14489
-api_logic_server_cli/prototypes/manager/system/genai/mcp_learning/mcp.prompt,sha256=D3JiMRqmTDEznDJcEIujd_vOkqy_txRUAgqgfg2tnIs,986
+api_logic_server_cli/prototypes/manager/system/genai/mcp_learning/mcp.prompt,sha256=XWE8K5KcWLgsHa1tdyFv-klbWk7wnzI_TcUZ67jMB84,1291
 api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/fixup.prompt,sha256=ZdVl-0J9oi8dS_3pDTrwdtvMSpDymbArTIlSEwcjCrM,305
 api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/graphics.prompt,sha256=FisvgcF8h2bdOL9iYQHOCT5NmW9RipnHzI6mzin3g8o,1265
 api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/graphics_request.prompt,sha256=T8lILtS_BtOjkalJPpiziVqlHVVc2PV6nz6qikNO808,175
@@ -6095,9 +6089,9 @@ api_logic_server_cli/tools/mini_skel/database/system/SAFRSBaseX.py,sha256=p8C7AF
 api_logic_server_cli/tools/mini_skel/database/system/TestDataBase.py,sha256=U02SYqThsbY5g3DX7XGaiMxjZBuOpzvtPS6RfI1WQFg,371
 api_logic_server_cli/tools/mini_skel/logic/declare_logic.py,sha256=fTrlHyqMeZsw_TyEXFa1VlYBL7fzjZab5ONSXO7aApo,175
 api_logic_server_cli/tools/mini_skel/logic/load_verify_rules.py,sha256=Rr5bySJpYCZmNPF2h-phcPJ53nAOPcT_ohZpCD93-a0,7530
-apilogicserver-15.0.0.dist-info/licenses/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
-apilogicserver-15.0.0.dist-info/METADATA,sha256=bWhoBYs468qQj04sZak-1god1nik6X2Gvbo5RJAN2uI,6548
-apilogicserver-15.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-apilogicserver-15.0.0.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
-apilogicserver-15.0.0.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
-apilogicserver-15.0.0.dist-info/RECORD,,
+apilogicserver-15.0.9.dist-info/licenses/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
+apilogicserver-15.0.9.dist-info/METADATA,sha256=sDuEWjnABJFeKoHsc_hdv0S_uef_IzdmtONeUzy27mc,6548
+apilogicserver-15.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+apilogicserver-15.0.9.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
+apilogicserver-15.0.9.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
+apilogicserver-15.0.9.dist-info/RECORD,,

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

@@ -1,15 +0,0 @@
-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`.