ApiLogicServer 14.5.17__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():
@@ -281,40 +19,29 @@ def declare_logic():
         This illustrates the request pattern.
 
         The request pattern is a common pattern in API Logic Server, 
-        where an insert triggers service invocation, such as sending email.
+        where an insert triggers service invocation, such as sending email or issue mcp requests.
         
-        The Email table includes the columns for the email (e,g, recipient, subject, message).
-        
-        Using a request object enables you to wrap the service call with logic, eg:
-        
-        * *email requirement: do not send mail if customer has opted out*  
+        The SysMCP table captures the prompt (in the row); this logic executes the MCP processing. 
 
         See: https://apilogicserver.github.io/Docs/Integration-MCP/#3a-logic-request-pattern     
     """
 
 
-    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
+        #als: create an MCP request.  See https://apilogicserver.github.io/Docs/Integration-MCP/
 
-        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"}}'
+        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, 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/{REAMDE.md → README.md}

@@ -1,7 +1,7 @@
 ---
 title: Welcome
 Description: Instant mcp-enabled microservices, standard projects, declarative business logic
-version info: 2.0 (05/24/2025)
+version info: 2.0 (05/24/2025) from install
 ---
 <style>
   .md-typeset h1,
@@ -250,7 +250,9 @@ Observe the rules firing in the console log - see Logic In Action, below.
 
 <summary>See Logic In Action </summary>
 
-<br>
+<br>[Declare logic](Logic.md#declaring-rules){:target="_blank" rel="noopener"} with WebGenAI, or in your IDE using code completion or Natural Language:
+
+![Nat Lang Logic](images/sample-ai/copilot/copilot-logic-chat.png)
 
 **a. Chaining**
 
@@ -263,6 +265,9 @@ Note that it's a `Multi-Table Transaction`, as indicated by the indentation.  Th
 **b. 40X More Concise**
 
 The 5 spreadsheet-like rules represent the same logic as 200 lines of code, [shown here](https://github.com/valhuber/LogicBank/wiki/by-code).  That's a remarkable 40X decrease in the backend half of the system.
+
+> 💡 No FrankenCode<br>Note the rules look like syntactically correct requirements.  They are not turned into piles of unmanageable "frankencode" - see [models not frankencode](https://www.genai-logic.com/faqs#h.3fe4qv21qtbs){:target="_blank" rel="noopener"}.
+
 <br><br>
 
 **c. Automatic Re-use**
@@ -285,6 +290,29 @@ Optionally, you can use the Behave TDD approach to define tests, and the Rules R
 
 &nbsp;
 
+### Logic-Enabled MCP
+
+Logic is automatically executed in your MCP-enabled API.  For example, consider the following MCP orchestration:
+
+```
+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.
+```
+
+When sending email, we require a business rules to ensure it respects the opt-out policy:
+
+![email request](images/integration/mcp/3a-email-logic.png)
+
+With the server running, test it by posting to `SysMCP` like this:
+
+```bash
+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"}}'
+```
+
+For more on MCP, [click here](Integration-MCP.md){:target="_blank" rel="noopener"}.
+
+&nbsp;
+
 ## 4. Iterate with Rules and Python
 
 Not only are spreadsheet-like rules 40X more concise, they meaningfully simplify maintenance.  Let's take an example:

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-14.5.17.dist-info → apilogicserver-15.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ApiLogicServer
-Version: 14.5.17
+Version: 15.0.9
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://www.genai-logic.com
@@ -84,7 +84,7 @@ Dynamic: license-file
 
 # TL;DR
 
-Create an executable project (API and Admin App) from a database or natural language prompt with 1 command, customize with declarative rules and Python in your IDE, containerize and deploy.
+Create an executable project (MCP-enabled API and Admin App) from a database or natural language prompt with 1 command; customize with declarative rules and Python in your IDE, containerize and deploy.
 
 &nbsp;
 
@@ -136,7 +136,7 @@ For Developers and their organizations seeking to **increase business agility,**
 
 API Logic Server provides ***Microservice Automation:*** create executable projects with 1 command:
 
-1. ***API Automation:*** crud for each table, with pagination, optimistic locking, filtering and sorting, and
+1. ***MCP-enabled API Automation:*** crud for each table, with pagination, optimistic locking, filtering and sorting, and
 
 2. ***App Automation:*** a multi-page, multi-table Admin App.  <br>