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

api_logic_server_cli/api_logic_server.py

@@ -12,10 +12,10 @@ ApiLogicServer CLI: given a database url, create [and run] customizable ApiLogic
 Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
 '''
 
-__version__ = "14.05.04"  # last public release: 14.05.00
+__version__ = "14.05.14"  # last public release: 14.05.00
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
-    "\t05/20/2024 - 14.05.04: factored mcp filters with working date range (AND), email stub, use basic_demo custs for genai_demo \n"\
+    "\t05/27/2024 - 14.05.14: tour - re-factored default mcp req with generic Post, email stub, use basic_demo custs for genai_demo \n"\
     "\t05/16/2024 - 14.05.00: safrs 3.1.7, running mcp preview \n"\
     "\t04/27/2024 - 14.04.00: Graphics preview, Vibe install fix, Improved IDE Chat Logic, MCP Exploration \n"\
     "\t03/30/2024 - 14.03.25: WebGenAI fixes for Kafka and Keycloak \n"\
@@ -100,7 +100,7 @@ if debug_value is not None:
         logging.getLogger('create_from_model.model_creation_services').setLevel(logging.DEBUG)
         
 
-log.debug("Patch to enable import of outer directories")
+# log.debug("Patch to enable import of outer directories")
 sys.path.append(get_api_logic_server_dir())  # e.g, on Docker: export PATH="/home/api_logic_server/api_logic_server_cli"
 api_logic_server_path = os.path.dirname(get_api_logic_server_dir())  # e.g: export PATH="/home/api_logic_server"
 sys.path.append(api_logic_server_path)
@@ -1341,7 +1341,7 @@ from database import <project.bind_key>_models
         
         log.debug("\n==================================================================")
         if msg != "":
-            log.debug("  2. Add User.Login endpoint")
+            log.debug("  2. Add User.Login endpoint for Swagger")
         log.debug("==================================================================\n")
         login_endpoint_filename = f'{self.api_logic_server_dir_path.joinpath("templates/login_endpoint.txt")}'
         auth_models_file_name = f'{self.project_directory_path.joinpath("database/database_discovery/authentication_models.py")}'
@@ -1380,124 +1380,6 @@ from database import <project.bind_key>_models
         self.model_creation_services.resource_list = save_resource_list
         
 
-    def add_auth_from_scratch(self, msg: str, is_nw: bool = False):  # TODO: remove
-        """add authentication models to project, update config; leverage multi-db support.  kat
-
-        Prior to 10.04.50, if provider_type is sql: 
-        1. add-db --auth-db_url= [ auth | db_url ] by calling self.create_project()
-        2. add user.login endpoint
-        3. Set SECURITY_ENABLED in config.py
-        4. Adding Sample authorization to security/declare_security.py, or user
-
-        Alert: complicated self.create_project() non-recursive flow:
-        1. Use model_creation_services to create auth models
-        2. By re-running app_creator (which leaves resources at auth, not db)
-        3. So, save/restore resource_list, bind_key, db_url, abs_db_url
-
-        Args:
-            msg (str): eg: "ApiLogicProject customizable project created.  Adding Security:")
-            is_nw (bool): is northwind, which means we add the nw security logic
-            provider_type (str): sql or keycloak
-        """
-
-        if create_utils.does_file_contain(search_for="SECURITY_ENABLED = True  #",
-                                          in_file=f'{self.project_directory}/config/config.py'):
-            if create_utils.does_file_contain(search_for="sql.auth_provider import Authentication_Provider",
-                                          in_file=f'{self.project_directory}/config/config.py'):
-                pass  # ok to go from sql -> keycloak
-            else:
-                log.info(f'\nAlready present in config/config.py - no action taken\n')
-                return
-        
-        if self.auth_provider_type == 'keycloak':
-            log.debug("\n==================================================================")
-            if msg != "":
-                log.debug("  1. Set SECURITY_ENABLED in config.py")
-            log.debug("==================================================================\n")
-            create_utils.replace_string_in_file(search_for="SECURITY_ENABLED = False  #",
-                                replace_with='SECURITY_ENABLED = True  #',
-                                in_file=f'{self.project_directory}/config/config.py')
-            create_utils.replace_string_in_file(search_for="security.authentication_provider.sql.auth_provider",
-                                replace_with='security.authentication_provider.keycloak.auth_provider',
-                                in_file=f'{self.project_directory}/config/config.py')
-            create_utils.copy_md(project = self, from_doc_file = "Keycloak-devnotes.md", 
-                                 to_project_file='devops/keycloak/Readme-keycloak.md')
-        else:
-            save_run = self.run
-            save_command = self.command
-            save_db_url = self.db_url
-            save_abs_db_url = self.abs_db_url
-            save_nw_db_status = self.nw_db_status
-            save_resource_list = None
-            if self.model_creation_services is not None:
-                save_resource_list = self.model_creation_services.resource_list
-            save_bind_key = self.bind_key
-            self.command = "add_db"
-            if self.auth_db_url == "":
-                self.auth_db_url = 'auth'  # for create manager
-            self.db_url = self.auth_db_url
-            self.bind_key = "authentication"
-            is_northwind = is_nw or self.nw_db_status in ["nw", "nw+"]  # nw_db_status altered in create_project
-            if is_northwind:  # is_nw or self.nw_db_status ==  "nw":
-                self.db_url = "auth"  # shorthand for api_logic_server_cli/database/auth...
-            
-            ''' non-recursive call to create_project() '''
-            self.run = False
-            self.create_project()  # not creating project, but using model creation svcs to add authdb
-            
-            self.run = save_run
-            self.command = save_command
-            self.db_url = save_db_url
-            self.abs_db_url = save_abs_db_url
-            self.bind_key = save_bind_key
-            self.nw_db_status = save_nw_db_status
-            self.model_creation_services.resource_list = save_resource_list
-            
-            log.debug("\n==================================================================")
-            if msg != "":
-                log.debug("  2. Add User.Login endpoint")
-            log.debug("==================================================================\n")
-            login_endpoint_filename = f'{self.api_logic_server_dir_path.joinpath("templates/login_endpoint.txt")}'
-            auth_models_file_name = f'{self.project_directory_path.joinpath("database/authentication_models.py")}'
-            with open(login_endpoint_filename, 'r') as file:
-                login_endpoint_data = file.read()
-            create_utils.insert_lines_at(lines=login_endpoint_data, 
-                        at='UserRoleList : Mapped[List["UserRole"]] = relationship(back_populates="user")',
-                        after=True,
-                        file_name=auth_models_file_name)
-            login_endpoint_filename = f'{self.api_logic_server_dir_path.joinpath("templates/login_endpoint_imports.txt")}'
-            auth_models_file_name = f'{self.project_directory_path.joinpath("database/authentication_models.py")}'
-            with open(login_endpoint_filename, 'r') as file:
-                login_endpoint_data = file.read()
-            create_utils.insert_lines_at(lines=login_endpoint_data, 
-                        at="import declarative_base", after=True,
-                        file_name=auth_models_file_name)
-
-            log.debug("\n==================================================================")
-            if msg != "":
-                log.debug("  3. Set SECURITY_ENABLED in config.py")
-            log.debug("==================================================================\n")
-            create_utils.replace_string_in_file(search_for="SECURITY_ENABLED = False  #",
-                                replace_with='SECURITY_ENABLED = True  #',
-                                in_file=f'{self.project_directory}/config/config.py')
-            if is_northwind:  # is_nw or self.nw_db_status ==  "nw":
-                log.debug("\n==================================================================")
-                if msg != "":
-                    if msg != "":
-                        log.debug("  4. Adding Sample authorization to security/declare_security.py")
-                    log.debug("==================================================================\n\n")
-                    nw_declare_security_py_path = self.api_logic_server_dir_path.\
-                        joinpath('prototypes/nw/security/declare_security.py')
-                    declare_security_py_path = self.project_directory_path.joinpath('security/declare_security.py')
-                    shutil.copyfile(nw_declare_security_py_path, declare_security_py_path)
-            else:
-                log.debug("\n==================================================================")
-                if msg != "":
-                    log.debug("  4. TODO: Declare authorization in security/declare_security.py")
-                log.debug("==================================================================\n\n")
-        self.add_auth_in_progress = False
-
-
     def insert_tutorial_into_readme(self):
         """ insert docs tutorial.md into readme at --> Tip: create the sample """
         project_readme_file_path = self.project_directory_path.joinpath('readme.md')

api_logic_server_cli/api_logic_server_info.yaml

@@ -1,3 +1,3 @@
-last_created_date: May 20, 2025 15:00:15
-last_created_project_name: ../../../servers/basic_demo
-last_created_version: 14.05.03
+last_created_date: May 27, 2025 20:52:10
+last_created_project_name: samples/nw_sample_nocust
+last_created_version: 14.05.12

api_logic_server_cli/create_from_model/api_logic_server_utils.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import re
 import shutil
 import subprocess, os, sys
 from pathlib import Path
@@ -78,14 +79,14 @@ def get_project_directory_and_api_name(project):
         rtn_api_name, \
         rtn_merge_into_prototype
 
-def copy_md(project: 'ProjectRun', from_doc_file: str, to_project_file: str = "README.md"):
+def copy_md(project, from_doc_file: str, to_project_file: str = "README.md"):
     """ Copy readme files (and remove !!!) from:
     
     1. github (to acquire more recent version since release)
     
     2. dev docs, if exists (gold version in docs, not prototypes).
 
-    Used by Sample-AI; Sample-Integration (nw-), Tutorial, Tutorial-3 (3 projects), Sample-Basic-Demo;
+    Used by Sample-AI; Sample-Integration (nw-), Tutorial, Tutorial-3 (3 projects), Sample-Basic-Demo; Manager
 
     Removing !!! -- special handling
 
@@ -95,14 +96,18 @@ def copy_md(project: 'ProjectRun', from_doc_file: str, to_project_file: str = "R
 
     Image references are made absolute (to github).
 
-    Doc Links are not well displayed in Codespaces, so should me minimized.
+    Doc Links are made absolute.
 
     Args:
-        project (ProjectRun): project object (project name, etc)
-        from_doc_file (str): eg, Sample-Basic_Demo.md
-        to_project_file (str, optional): _description_. Defaults to "README.md".
+        project (ProjectRun or Path): project object (project name, etc)
+        from_doc_file (str): eg, Sample-Basic_Demo.md (no docs/)
+        to_project_file (str, optional): location of target. Defaults to "README.md".
     """
-    project_path = project.project_directory_path
+    if isinstance(project, Path):
+        project_path = project
+    else:
+        project_path = project.project_directory_path
+
     to_file = project_path.joinpath(to_project_file)
     docs_path = Path(get_api_logic_server_dir()).parent.parent
     from_doc_file_path = docs_path.joinpath(f'Docs/docs/{from_doc_file}')
@@ -126,7 +131,10 @@ def copy_md(project: 'ProjectRun', from_doc_file: str, to_project_file: str = "R
         copyfile(src = from_doc_file_path, dst = to_file)
     
     # now remove the !!, and unindent (mkdocs features fail in a readme)
-    if to_file.exists():
+    if not to_file.exists():    # can occur if offline
+        shutil.copy(Path(get_api_logic_server_dir()).joinpath('prototypes/base').joinpath('readme.md'), 
+                    to_file)
+    else:
         with open(str(to_file), "r") as readme_file:
             readme_lines_mkdocs = readme_file.readlines()    
         readme_lines_md = []
@@ -134,7 +142,7 @@ def copy_md(project: 'ProjectRun', from_doc_file: str, to_project_file: str = "R
         db_line_num = 0
         for each_line in readme_lines_mkdocs:
             db_line_num += 1
-            if "ai-driven-automation-video" in each_line:
+            if "title: Instant Microservices" in each_line:
                 debug_str = "Good Breakpoint"
             if "from docsite" in each_line:
                 each_line = each_line.replace("from docsite", "from docsite, for readme")
@@ -160,14 +168,25 @@ def copy_md(project: 'ProjectRun', from_doc_file: str, to_project_file: str = "R
                         each_line = each_line[4:]
                     in_mkdocs_block_with_sections = True
                 each_line = each_line.replace('{:target="_blank" rel="noopener"}', '')
-                if each_line.startswith('![') or each_line.startswith('[!['):
+                if each_line.startswith('![') or each_line.startswith('[![') or each_line.startswith('    !['):
                     if "https://github.com/ApiLogicServer" not in each_line:     # make doc-relative urls absolute...
                         if "creates-and-runs-video" in each_line:
                             debug_stop = "good stop"
                         each_line = each_line.replace('images', 'https://github.com/ApiLogicServer/Docs/blob/main/docs/images')
                         each_line = each_line.replace('png)', 'png?raw=true)')
+                        each_line = each_line.replace('jpeg)', 'jpeg?raw=true)')
+                        each_line = each_line.replace('jpg)', 'jpg?raw=true)')
                     else:
                         pass # image is absolute - don't alter
+                if '.md' in each_line:
+                    # replace (<name>.md) with (https://apilogicserver.github.io/Docs/<name>)
+                    each_line = re.sub(
+                        r'\(([^)]+\.md)\)',
+                        r'(https://apilogicserver.github.io/Docs/\1)',
+                        each_line
+                    )
+                    each_line = each_line.replace('.md', '')
+                    pass
                 readme_lines_md.append(each_line)
         with open(str(to_file), "w") as readme_file:
             readme_file.writelines(readme_lines_md)

api_logic_server_cli/create_from_model/dbml.py

@@ -7,15 +7,12 @@ import os
 import pathlib
 from pathlib import Path
 from typing import NewType, List, Tuple, Dict
-
-import sqlalchemy
-import yaml
 from sqlalchemy import MetaData, false
 import datetime
 import api_logic_server_cli.create_from_model.model_creation_services as create_from_model
 import api_logic_server_cli.create_from_model.api_logic_server_utils as create_utils
 from dotmap import DotMap
-
+import api_logic_server_cli.genai.genai_svcs as genai_svcs
 from api_logic_server_cli.create_from_model.meta_model import Resource, ResourceAttribute, ResourceRelationship
 
 
@@ -74,9 +71,6 @@ class DBMLCreator(object):
                 "tool_type": "json-api",
                 "schema_version": "1.0",
                 "base_url": "http://localhost:5656/api",
-                "query_params": "- JSON:API custom filtering using a filter array (e.g., filter=[{\"name\":\"date_shipped\",\"op\":\"gt\",\"val\":\"2023-07-14\"}])",
-                "expected_response": "Respond with a JSON object with tool_type, schema_version, base_url, and an array of resources including: path, method, query_params array or body, headers, expected_output.",
-                "email_services": "iff email is requested, Send email by issing a POST request to the Email endpoint, setting the customer_id and message in the body.",
                 "description": f"API Logic Project: {self.mod_gen.project.project_name_last_node}",
                 "resources": [
                 ]
@@ -198,7 +192,7 @@ class DBMLCreator(object):
 
 
 
-    def create_mcp_json_file(self):
+    def create_docs_mcp(self):
         """ create docs/mcp_schema.json - create self.mcp_schema['resources'] entries like:
 
         '''
@@ -213,6 +207,18 @@ class DBMLCreator(object):
         '''        
         """
         
+        docs_path = Path(self.mod_gen.project_directory).joinpath('docs')
+        docs_path.mkdir(parents=True, exist_ok=True)
+        # mcp_learning_src = Path(create_utils.get_api_logic_server_dir()).joinpath('prototypes/manager/system/genai/mcp_learning')
+        mcp_learning_src = genai_svcs.get_manager_path(use_env=True).joinpath('system/genai/mcp_learning')
+        mcp_learning_dst = Path(self.mod_gen.project_directory).joinpath('docs/mcp_learning')
+        if mcp_learning_dst.exists():
+            shutil.rmtree(mcp_learning_dst)
+        shutil.copytree(
+            src=mcp_learning_src,
+            dst=mcp_learning_dst
+        )
+
         resources : list = self.mcp_schema['resources']
         for each_resource_name in self.mod_gen.resource_list:
             if self.do_process_resource(each_resource_name):
@@ -226,9 +232,7 @@ class DBMLCreator(object):
                     each_inserted_resource['fields'].append(each_attr.name)
                 each_inserted_resource['filterable'] = each_inserted_resource['fields']
                 resources.append(each_inserted_resource)
-        docs_path = Path(self.mod_gen.project_directory).joinpath('docs')
-        docs_path.mkdir(parents=True, exist_ok=True)
-        mcp_schema_path = Path(self.mod_gen.project_directory).joinpath('docs/mcp_schema.json')
+        mcp_schema_path = Path(self.mod_gen.project_directory).joinpath('docs/mcp_learning/mcp_schema.json')
         # write self.mcp_schema dict to json file
         with open(mcp_schema_path, 'w') as f:
             json.dump(self.mcp_schema, f, indent=4)
@@ -240,5 +244,5 @@ def create(model_creation_services: create_from_model.ModelCreationServices):
     """
     dbml_creator = DBMLCreator(model_creation_services)
     dbml_creator.create_docs_dbml_file()
-    dbml_creator.create_mcp_json_file()
+    dbml_creator.create_docs_mcp()
 

api_logic_server_cli/genai/genai.py

@@ -587,12 +587,16 @@ class GenAI(object):
                     shutil.copyfile(self.project.genai_repaired_response, response_file)
             is_genai_demo = False
             if os.getenv('APILOGICPROJECT_IS_GENAI_DEMO') is not None or self.project.project_name == 'genai_demo':
+                # fail safe demo - be sure AI does not fail, and that the data model names are predictable for add-cust
                 self.project.project_directory_path.joinpath('docs/project_is_genai_demo.txt').touch()
                 # and DON'T create test data (db.sqlite already set up in recursive copy)
                 project_docs_response = self.project.project_directory_path.joinpath('docs/response.json')
                 with open(project_docs_response, "w") as response_file:  # WebG uses this for wg_rules
                     json.dump(self.response_dict, response_file, indent=4)
                     pass  # not possible on create_db_models, since project paths not yet set by api_logic_server
+                if add_mcp := False:  # bad idea - fails with Ont seeking email (which would be confusing)
+                    from api_logic_server_cli.add_cust import add_cust
+                    add_cust.add_basic_demo_customizations(project=self.project)
 
             else:  # normal path
                 genai_svcs.rebuild_test_data_for_project(

api_logic_server_cli/genai/genai_svcs.py

@@ -924,14 +924,22 @@ def call_chatgpt(messages: List[Dict[str, str]], api_version: str, using: str) -
         log.error(f"\n\nError: ChatGPT call failed\n- please see https://apilogicserver.github.io/Docs/WebGenAI-CLI/#configuratio\n{inst}\n\n")
         sys.exit(1)
 
-def get_manager_path() -> Path:
+def get_manager_path(use_env: bool = False) -> Path:
     """ Checks cwd, parent, and grandparent for system/genai
 
     * Possibly could add cli arg later
 
+    Args:
+        use_env: bool if cannot find manager from project, use install location
+
     Returns:
         Path: Manager path (contains system/genai)
     """
+
+    if use_env and os.getenv("APILOGICSERVER_HOME") is not None:
+        result_path = Path(os.getenv("APILOGICSERVER_HOME")).joinpath('api_logic_server_cli/prototypes/manager')
+        return result_path
+
     result_path = Path(os.getcwd())  # normal case - project at manager root
     check_system_genai = result_path.joinpath('system/genai')    
     if check_system_genai.exists():
@@ -964,8 +972,8 @@ def get_manager_path() -> Path:
 
     result_path = result_path.parent  # try ancestors - this is for import testing
     check_system_genai = result_path.joinpath('system/genai')
+
     assert check_system_genai.exists(), f"Manager Directory not found: {check_system_genai}"
-    
     return result_path
 
 

api_logic_server_cli/manager.py

@@ -117,7 +117,8 @@ def create_manager(clean: bool, open_with: str, api_logic_server_path: Path,
             from_docker_dir = api_logic_server_path.joinpath('prototypes/manager_docker')
             copied_path = shutil.copytree(src=from_docker_dir, dst=to_dir, dirs_exist_ok=True)
 
-        file_src = f"https://raw.githubusercontent.com/ApiLogicServer/ApiLogicServer-src/main/api_logic_server_cli//README.md"
+        # get latest readme from git (eg, has been updated since pip install)
+        file_src = f"https://raw.githubusercontent.com/ApiLogicServer/ApiLogicServer-src/main/api_logic_server_cli/prototypes/manager/README.md"
         readme_path = to_dir.joinpath('README.md')
         try:
             r = requests.get(file_src)  # , params=params)
@@ -130,6 +131,7 @@ def create_manager(clean: bool, open_with: str, api_logic_server_path: Path,
             pass    # just fall back to using the pip-installed version
         except:     # do NOT fail 
             pass    # just fall back to using the pip-installed version
+        create_utils.copy_md(from_doc_file='Sample-Basic-Tour.md', project = to_dir)
 
         if not samples:
             shutil.rmtree(to_dir.joinpath(f'{docker_volume}system/app_model_editor'))

api_logic_server_cli/prototypes/base/.vscode/launch.json

@@ -107,6 +107,32 @@
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
         },
+        {
+            "name": "  - Run designated Python file",
+// use this for test programs, eg to test the server
+            "type": "debugpy",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "program": "${input:inputProjectName}",
+            "redirectOutput": true,
+            "justMyCode": false,
+            "args": ["go"],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "MCP - Model Context Protocol - Client Executor",
+// a simple client to test the Model Context Protocol, default request for basic_demo
+            "type": "debugpy",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "program": "integration/mcp/mcp_client_executor.py",
+            "redirectOutput": true,
+            "justMyCode": false,
+            "args": ["list customers with balance over 100"],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
         {
             "name": "Install Ontimize (npm install)",
             "type": "node",
@@ -270,5 +296,19 @@
             "justMyCode": false,
             "console": "integratedTerminal"
         }
+    ],
+    "inputs": [
+        {
+            "id": "inputProjectName",
+            "type": "promptString",
+            "description": "Python File Name to Run",
+            "default": "integration/mcp/mcp_client_executor.py"
+        },
+        {
+            "id": "inputMcpRequest",
+            "type": "promptString",
+            "description": "Request for MCP Client Executor",
+            "default": "find customers with balance over 500"
+        }
     ]
 }

api_logic_server_cli/prototypes/base/api/api_discovery/mcp_discovery.py

@@ -0,0 +1,58 @@
+from flask import request, jsonify
+from flask import Flask, redirect, send_from_directory, send_file
+import logging
+import os
+import json
+import io
+
+import requests
+from config.config import Args  # circular import error if at top
+
+app_logger = logging.getLogger("api_logic_server_app")
+
+def add_service(app, api, project_dir, swagger_host: str, PORT: str, method_decorators = []):
+    pass
+
+    def get_server_url():
+        """ return the server URL for the OpenAPI spec """
+        result = f'http://{Args.instance.swagger_host}:{Args.instance.swagger_port}'
+        # get env variable API_LOGIC_SERVER_TUNNEL (or None)
+        if tunnel_url := os.getenv("API_LOGIC_SERVER_TUNNEL", None):
+            app_logger.info(f".. tunnel URL: {tunnel_url}")
+            result = tunnel_url
+        return result  #  + '/api'
+        
+
+
+    @app.route('/.well-known/mcp.json', methods=['GET'])
+    def mcp_discovery(path=None):
+        ''' called by mcp_client_executor for discovery, eg:
+        ```
+        {
+            "tool_type": "json-api",
+            "schema_version": "1.0",
+            "base_url": "https://crm.company.com",
+            "resources": [
+                {
+                "name": "Customer",
+                "path": "/Customer",
+                "methods": ["GET", "PATCH"],
+                "fields": ["id", "name", "balance", "credit_limit"],
+                "filterable": ["name", "credit_limit"],
+                "example": "List customers with credit over 5000"
+                }
+            ]
+        }
+        ```
+        test: curl -X GET "http://localhost:5656/.well-known/mcp.json"
+        '''
+        # return docs/mcp_schema.json
+        schema_path = os.path.join(project_dir, "docs/mcp_learning/mcp_schema.json")
+        try:
+            with open(schema_path, "r") as schema_file:
+                schema = json.load(schema_file)
+                return jsonify(schema), 200
+        except Exception as e:
+            app_logger.error(f"Error loading MCP schema: {e}")
+            return jsonify({"error": "MCP schema not found"}), 404
+        pass

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

@@ -1,11 +1,15 @@
+import json
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import Column, DECIMAL, Date, ForeignKey, Integer, String
-from safrs import SAFRSBase
+from safrs import SAFRSBase, ValidationError
 from flask_login import UserMixin
 import safrs, flask_sqlalchemy
 from safrs import jsonapi_attr
 from flask_sqlalchemy import SQLAlchemy
 from datetime import datetime
+import operator
+import json
+
 
 Base = declarative_base()  # type: flask_sqlalchemy.model.DefaultMeta
 #vh new x
@@ -28,7 +32,7 @@ def jsonapi_filter(cls):
     if sqlWhere != "":    
         return query.filter(text(sqlWhere))
     else:
-        return query.filter(or_(*expressions))   
+        return query.filter(and_(*expressions))   
 
 class SAFRSBaseX(SAFRSBase, safrs.DB.Model):
     __abstract__ = True
@@ -58,6 +62,68 @@ class SAFRSBaseX(SAFRSBase, safrs.DB.Model):
         
         return super()._s_parse_attr_value(attr_name, attr_val)
 
+
+    @classmethod
+    def _s_filter(cls, *filter_args, **filter_kwargs):
+        """
+        Apply a filter to this model
+        :param filter_args: A list of filters information to apply, passed as a request URL parameter.
+        Each filter object has the following fields:
+        - name: The name of the field you want to filter on.
+        - op: The operation you want to use (all sqlalchemy operations are available). The valid values are:
+            - like: Invoke SQL like (or "ilike", "match", "notilike")
+            - eq: check if field is equal to something
+            - ge: check if field is greater than or equal to something
+            - gt: check if field is greater than to something
+            - ne: check if field is not equal to something
+            - is_: check if field is a value
+            - is_not: check if field is not a value
+            - le: check if field is less than or equal to something
+            - lt: check if field is less than to something
+        - val: The value that you want to compare.
+        :return: sqla query object
+        """
+        try:
+            filters = json.loads(filter_args[0])
+        except json.decoder.JSONDecodeError:
+            raise ValidationError("Invalid filter format (see https://github.com/thomaxxl/safrs/wiki)")
+
+        if not isinstance(filters, list):
+            filters = [filters]
+
+        expressions = []
+        query = cls._s_query
+
+        for filt in filters:
+            if not isinstance(filt, dict):
+                safrs.log.warning(f"Invalid filter '{filt}'")
+                continue
+            attr_name = filt.get("name")
+            attr_val = filt.get("val")
+            if attr_name != "id" and attr_name not in cls._s_jsonapi_attrs:
+                raise ValidationError(f'Invalid filter "{filt}", unknown attribute "{attr_name}"')
+
+            op_name = filt.get("op", "").strip("_")
+            attr = cls._s_jsonapi_attrs[attr_name] if attr_name != "id" else cls.id
+            if op_name in ["in", "notin"]:
+                op = getattr(attr, op_name + "_")
+                query = query.filter(op(attr_val))
+            elif op_name in ["like", "ilike", "match", "notilike"] and hasattr(attr, "like"):
+                # => attr is Column or InstrumentedAttribute
+                like = getattr(attr, op_name)
+                expressions.append(like(attr_val))
+            elif not hasattr(operator, op_name):
+                raise ValidationError(f'Invalid filter "{filt}", unknown operator "{op_name}"')
+            else:
+                op = getattr(operator, op_name)
+                expressions.append(op(attr, attr_val))
+
+        if len(filters) > 1:
+            return query.filter(operator.and_(*expressions))
+        else:
+            return query.filter(*expressions)
+
+
 class TestBase(Base):
     __abstract__ = True
     def __init__(self, *args, **kwargs):