ApiLogicServer 14.3.14__py3-none-any.whl → 14.3.20__py3-none-any.whl

api_logic_server_cli/genai/genai_logic_builder.py

@@ -74,23 +74,7 @@ class GenAILogic(object):
         if suggest:
             self.suggest_logic()                  # suggest logic for prompt, or see logic code
         else:
-            logic_files = self.get_logic_files()  # rebuild rules from docs/logic/*.prompt
-            for each_file in logic_files:
-                with open(each_file, 'r') as file:
-                    log.debug(f'.. genai_logic_builder processes: {os.path.basename(each_file)}')
-                    logic = file.read()
-                logic_message = {"role": "user", "content": logic}
-                self.messages.append( logic_message ) # replace data model with logic
-                log.debug(f'.. ChatGPT - saving raw response to: system/genai/temp/chatgpt_original.response')
-                response_str = genai_svcs.call_chatgpt(messages=self.messages, api_version=self.project.genai_version, using=self.project.genai_using)
-                response = json.loads(response_str)
-                # FIXME - perhaps required for fixup (it is failing)
-                # the rules & data models are expected to be in docs... not there
-                # self.get_and_save_response_data(response=response, file=each_file)          # save raw response to docs/logic
-                self.response_dict = DotMap(response)
-                rule_list = self.response_dict.rules
-                each_code_file = self.project.project_directory_path.joinpath(f'logic/logic_discovery/{each_file.stem}.py')
-                self.insert_logic_into_project(rule_list=rule_list, file=each_code_file)     # insert logic into project
+            self.process_logic_files()            # process logic files (eg, from docs/logic/*.prompt)
         pass
 
     def get_logic_files(self) -> List[str]:
@@ -186,7 +170,63 @@ class GenAILogic(object):
         prompt_messages.extend(learnings)
                         
         return prompt_messages      
-    
+
+
+    def process_logic_files(self):
+        """
+        Processes logic files by reading them, sending their content to a generative AI service, 
+        and then inserting the generated logic into the project.
+
+        Process each docs/logic/*.prompt file to create corresponding file in logic/logic_discovery
+
+        """
+        """ CoPilot's doc (meh)
+
+        Steps:
+        1. Retrieve logic files from the specified directory.
+        2. For each logic file:
+            a. Read the file content.
+            b. Log the processing of the file.
+            c. Create a message with the file content.
+            d. Append the message to the list of messages.
+            e. Call the generative AI service with the messages.
+            f. Parse the response from the AI service.
+            g. Insert the generated logic into the project.
+            h. Reset the messages for the next file.
+        3. Log the completion of the process and provide instructions for checking and renaming files.
+
+        Note:
+        - The method assumes the existence of several helper methods and attributes such as 
+          `get_logic_files`, `genai_svcs.call_chatgpt`, `get_and_save_response_data`, 
+          `insert_logic_into_project`, and `get_learnings_and_data_model`.
+        - There are some FIXME comments indicating areas that may need further attention or fixing.
+        """
+
+        logic_files = self.get_logic_files()  # rebuild rules from docs/logic/*.prompt
+        for each_file in logic_files:
+            with open(each_file, 'r') as file:
+                log.debug(f'\n.. genai_logic_builder/process_logic_files - logic file: {os.path.basename(each_file)}')
+                logic = file.read()
+            logic_message = {"role": "user", "content": logic}
+            self.messages.append( logic_message ) # replace data model with logic
+            log.debug(f'.. ChatGPT - saving raw response to: system/genai/temp/chatgpt_original.response')
+            response_str = genai_svcs.call_chatgpt(messages=self.messages, api_version=self.project.genai_version, using=self.project.genai_using)
+            response = json.loads(response_str)
+            # see launch: GenAI - include Multiple Docs/Logic Files
+            # FIXME - perhaps required for fixup (it is failing)
+            # the rules & data models are expected to be in docs... not there for als projects?
+            # self.get_and_save_response_data(response=response, file=each_file)
+            # save raw response to docs/logic
+            self.response_dict = DotMap(response)
+            rule_list = self.response_dict.rules
+            each_code_file = self.project.project_directory_path.joinpath(f'logic/logic_discovery/{each_file.stem}.py')
+            self.insert_logic_into_project(rule_list=rule_list, file=each_code_file)     # insert logic into project
+            self.messages = self.get_learnings_and_data_model()  # reset messages for next file
+            self.messages_length = len(self.messages)
+        log.info(f'\n.. Completed -- check logic/logic_discovery for new logic files, rename docs/logic files')
+
+
+
     def suggest_logic(self):
         """ Suggest logic for prompt, or translate suggestion to code
             self.messages already has learnings and data model
@@ -411,16 +451,35 @@ class GenAILogic(object):
         """
         result_path = Path(os.getcwd())
         check_system_genai = result_path.joinpath('system/genai')
+        if check_system_genai.exists():
+            return result_path
+        
+        result_path = result_path.parent
+        check_system_genai = result_path.joinpath('system/genai')
+        if check_system_genai.exists():
+            return result_path
         
+        result_path = result_path.parent
+        check_system_genai = result_path.joinpath('system/genai')
         if check_system_genai.exists():
             return result_path
         
         result_path = result_path.parent
         check_system_genai = result_path.joinpath('system/genai')
+        if check_system_genai.exists():
+            return result_path
         
+        
+        result_path = result_path.parent
+        check_system_genai = result_path.joinpath('system/genai')
         if check_system_genai.exists():
             return result_path
         
+        result_path = result_path.parent
+        check_system_genai = result_path.joinpath('system/genai')
+        if check_system_genai.exists():
+            return result_path
+
         result_path = result_path.parent
         check_system_genai = result_path.joinpath('system/genai')
         

api_logic_server_cli/genai/genai_svcs.py

@@ -141,9 +141,13 @@ def get_code_update_logic_file(rule_list: List[DotMap], logic_file_path: Path =
         insert_logic += translated_logic
         insert_logic += "\n    # End Logic from GenAI\n\n"
 
+        insert_point = 'discover_logic()'  # default for als`
+        if utils.does_file_contain(in_file=logic_file_path, search_for='# Logic from GenAI'):
+            insert_point = '# Logic from GenAI'
+
         utils.insert_lines_at(lines=insert_logic, 
                             file_name=logic_file_path, 
-                            at='discover_logic()', 
+                            at=insert_point, 
                             after=True)
         
         if 'Rule' not in imports:

api_logic_server_cli/prototypes/base/config/default.env

@@ -1,5 +1,7 @@
 SECRET_KEY = "whatnothow"
 SQLALCHEMY_TRACK_MODIFICATIONS = False
 SQLAlCHEMY_ECHO = False
+# AGGREGATE_DEFAULTS =  True
+# ALL_DEFAULTS = True
 # APILOGICPROJECT_KAFKA_PRODUCER = "{\"bootstrap.servers\": \"localhost:9092\"}"
 # SQLALCHEMY_DATABASE_URI=db.sqlite

api_logic_server_cli/prototypes/manager/.vscode/ApiLogicServer.code-workspace

@@ -9,7 +9,7 @@
 		"workbench.editorAssociations": {
 			"*.md": "vscode.markdown.preview.editor"
 		},
-		"workbench.colorTheme": "Office Theme (Publisher)",
-		"workbench.preferredLightColorTheme": "Office Theme (Publisher)"
+		"workbench.colorTheme": "Office Theme (Word)",
+		"workbench.preferredLightColorTheme": "Office Theme (Word)"
 	}
 }

api_logic_server_cli/prototypes/manager/run_sample.sh

@@ -0,0 +1,30 @@
+# Run samples using webgenai docker container
+
+# Before running, update ./system/genai/webg_local/webg_config/web_genai.txt
+# See: https://apilogicserver.github.io/Docs/WebGenAI-CLI/#configuration
+
+# cd samples
+# sh run.sh nw_sample_nocust
+
+echo "\n\nRun Samples using webgenai docker container"
+
+if [ $# -eq 0 ]
+  then
+    echo " "
+    # echo "shell: $SHELL"
+    echo " eg:"
+    echo " "
+    echo "   > cd webgenai  # or ApiLogicServer"
+    echo "   > sh run_sample.sh nw_sample_nocust"
+    echo " "
+    exit 0
+fi
+
+sample=$1
+if [ "$1" = "$" ]
+  then
+    sample="nw_sample"
+  fi
+
+cd samples/$sample
+docker run -it --rm --name api_logic_project -p 5656:5656 --env-file ./devops/docker-standard-image/env.list -v ./:/app apilogicserver/web_genai python3 /app/api_logic_server_run.py

api_logic_server_cli/prototypes/manager/run_web_genai.sh

@@ -0,0 +1,6 @@
+# Run WebGenAI from docker container
+
+# cd genai-logic-main
+# sh run_web_genai.sh
+
+docker compose -f webgenai/docker-compose-webg.yml up

api_logic_server_cli/prototypes/manager/system/Manager_workspace.code-workspace

@@ -9,7 +9,7 @@
 		"workbench.editorAssociations": {
 			"*.md": "vscode.markdown.preview.editor"
 		},
-		"workbench.colorTheme": "Office Theme (Publisher)",
-		"workbench.preferredLightColorTheme": "Office Theme (Publisher)"
+		"workbench.colorTheme": "Office Theme (Word)",
+		"workbench.preferredLightColorTheme": "Office Theme (Word)"
 	}
 }

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.devcontainer-option/For_VSCode.dockerfile

@@ -0,0 +1,10 @@
+# VSCode uses this file to create a development container, for you to customize and test API Logic Projects.
+#
+# Per .devcontainer/devcontainer.json, VSCode will offer to open your API Logic Server Project in this docker container
+#    Same as: View > Command > Remote-Containers: Open Folder in Container.
+#
+# https://apilogicserver.github.io/Docs/DevOps-Docker/
+#
+FROM apilogicserver/api_logic_server
+USER api_logic_server
+CMD ["bash"]

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.devcontainer-option/devcontainer.json

@@ -0,0 +1,64 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.194.0/containers/docker-existing-dockerfile
+{
+	"name": "Existing Dockerfile",
+
+	// Sets the run context to one level up instead of the .devcontainer folder.
+	"context": "..",
+
+	// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
+	"dockerFile": "For_VSCode.dockerfile",
+
+	// Set *default* container specific settings.json values on container create.
+	// "settings": {},
+
+	// add network -- enable this as required, e.g., https://apilogicserver.github.io/Docs/Database-Connectivity/
+	// "runArgs": ["--network=dev-network"],
+
+	// Add the IDs of extensions you want installed when the container is created.
+	// "extensions": [],   **** Note - Python added in customizations (autoloads Python in devcontainer)
+
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python",
+                "ms-python.vscode-pylance",
+                "ms-python.black-formatter",
+                "ms-python.flake8",
+                "ms-python.isort",
+				// "ms-python.debugpy",
+				"atariq11700.debugpy-old"
+            ],
+            "settings": {
+                "python.defaultInterpreterPath": "/usr/local/bin/python"
+            }
+        }
+    },
+	
+	"portsAttributes": {
+		"5656": {
+			"label": "AdminApp"
+		}
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [5656],
+	
+	"features": {
+		"github-cli": "latest"
+	  }
+
+	// "postAttachCommand": "/bin/bash .devcontainer/setup.sh"
+
+	// Uncomment the next line to run commands after the container is created - for example installing curl.
+	// "postCreateCommand": "apt-get update && apt-get install -y curl",
+
+	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
+	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+
+	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
+	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
+
+	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
+	// "remoteUser": "vscode"
+}

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.devcontainer-option/readme.md

@@ -0,0 +1 @@
+Rename (remove *-option*) to use [dev containers](https://apilogicserver.github.io/Docs/DevOps-Docker/).

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.devcontainer-option/setup.sh

@@ -0,0 +1,10 @@
+# echo "gh codespace ports -c $CODESPACE_NAME" >> ~/.bashrc
+
+if [ -z "$CODESPACE_NAME" ]
+then
+    echo "devcontainer ready with defined ports"
+else
+    echo ".devcontainer/setup: port creation..."
+    gh codespace ports visibility 5656:public -c $CODESPACE_NAME
+    echo ".devcontainer/setup: port created"
+fi

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+/build/
+/dist/
+**/__pycache__
+*.egg-info
+venv/
+test/api_logic_server_behave/scenario_logic_logs/
+devops/docker-compose-dev-local-nginx/www
+devops/docker-compose-dev-azure-nginx/www

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.idea/runConfigurations/ApiLogicServer.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ApiLogicServer" type="PythonConfigurationType" factoryName="Python">
+    <module name="genai_demo" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/api_logic_server_run.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.idea/runConfigurations/Report_Behave_Logic.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Report Behave Logic" type="PythonConfigurationType" factoryName="Python">
+    <module name="genai_demo" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/api_logic_server_behave" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/api_logic_server_behave/behave_logic_report.py" />
+    <option name="PARAMETERS" value="run --prepend_wiki=reports/&quot;Behave Logic Report Intro.md&quot; --wiki=reports/&quot;Behave Logic Report.md&quot;" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.idea/runConfigurations/Run_Behave.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Behave" type="PythonConfigurationType" factoryName="Python">
+    <module name="genai_demo" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/api_logic_server_behave" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/api_logic_server_behave/behave_run.py" />
+    <option name="PARAMETERS" value="--outfile=logs/behave.log" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.idea/runConfigurations/Windows_Run_Behave.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Wndows Run Behave" type="PythonConfigurationType" factoryName="Python">
+    <module name="genai_demo" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test/api_logic_server_behave" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/api_logic_server_behave/behave_run.py" />
+    <option name="PARAMETERS" value="--outfile=logs\\behave.log" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.idea/runConfigurations/run___No_Security.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ApiLogicServer - No Security" type="PythonConfigurationType" factoryName="Python">
+    <module name="genai_demo" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="SECURITY_ENABLED" value="False" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/api_logic_server_run.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/.idea/runConfigurations/run_docker.xml

@@ -0,0 +1,59 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ApiLogicServer docker" type="PythonConfigurationType" factoryName="Python">
+    <module name="py-ApiLogicProject" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="docker://apilogicserver/api_logic_server:latest/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="DockerContainerSettingsRunConfigurationExtension">
+      <option name="envVars">
+        <list />
+      </option>
+      <option name="extraHosts">
+        <list />
+      </option>
+      <option name="links">
+        <list />
+      </option>
+      <option name="networkDisabled" value="false" />
+      <option name="networkMode" value="bridge" />
+      <option name="portBindings">
+        <list>
+          <DockerPortBindingImpl>
+            <option name="containerPort" value="5000" />
+            <option name="hostPort" value="5000" />
+            <option name="protocol" value="tcp" />
+          </DockerPortBindingImpl>
+        </list>
+      </option>
+      <option name="publishAllPorts" value="false" />
+      <option name="runCliOptions" value="--entrypoint= --rm" />
+      <option name="version" value="2" />
+      <option name="volumeBindings">
+        <list>
+          <DockerVolumeBindingImpl>
+            <option name="containerPath" value="/opt/project" />
+            <option name="editable" value="true" />
+            <option name="hostPath" value="$PROJECT_DIR$" />
+            <option name="readOnly" value="false" />
+          </DockerVolumeBindingImpl>
+        </list>
+      </option>
+    </EXTENSION>
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/api_logic_server_run.py" />
+    <option name="PARAMETERS" value="localhost" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>