diff --git a/level_4/.env.template b/.env.template similarity index 100% rename from level_4/.env.template rename to .env.template diff --git a/.github/actions/image_builder/action.yaml b/.github/actions/image_builder/action.yaml index 607b850a..ad516ca1 100644 --- a/.github/actions/image_builder/action.yaml +++ b/.github/actions/image_builder/action.yaml @@ -33,4 +33,3 @@ runs: image_name="${{ inputs.ecr_image_repo_name }}" docker_login="true" version="$VERSION" account="${{ inputs.aws_account_id }}" app_dir="$APP_DIR" publish="${{ inputs.should_publish }}" ./bin/dockerize echo "Docker tag is: $VERSION" echo $VERSION > /tmp/.DOCKER_IMAGE_VERSION - diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 9048afb3..c42af72b 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -47,8 +47,8 @@ jobs: stage: dev aws_account_id: ${{ env.AWS_ACCOUNT_ID_DEV }} should_publish: true - ecr_image_repo_name: promethai-dev-backend-promethai-backend-memory - dockerfile_location: level_2/. + ecr_image_repo_name: promethai-dev-backend-promethai-backend + dockerfile_location: ./ - name: Export Docker image tag id: export-promethai-docker-tag run: | @@ -58,19 +58,19 @@ jobs: outputs: promethai_docker_tag_backend: ${{ steps.export-promethai-docker-tag.outputs.promethai_docker_tag_backend }} -# apply_tf: -# name: Trigger terraform apply workflow -# runs-on: ubuntu-latest -# needs: publish_docker_to_ecr -# steps: -# - name: TF apply workflow triggers step -# uses: actions/github-script@v6 -# with: -# github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }} -# script: | -# await github.rest.actions.createWorkflowDispatch({ -# owner: 'topoteretes', -# repo: 'PromethAI-Infra', -# workflow_id: 'terraform.apply.yml', -# ref: 'main' -# }) + apply_tf: + name: Trigger terraform apply workflow + runs-on: ubuntu-latest + needs: publish_docker_to_ecr + steps: + - name: TF apply workflow triggers step + uses: actions/github-script@v6 + with: + github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }} + script: | + await github.rest.actions.createWorkflowDispatch({ + owner: 'topoteretes', + repo: 'PromethAI-Infra', + workflow_id: 'terraform.apply.yml', + ref: 'main' + }) diff --git a/.github/workflows/cd_prd.yaml b/.github/workflows/cd_prd.yaml index 5b7f0247..e7327140 100644 --- a/.github/workflows/cd_prd.yaml +++ b/.github/workflows/cd_prd.yaml @@ -23,38 +23,38 @@ jobs: steps: - name: Take code from repo uses: actions/checkout@v3 -# - name: Set environment variable for stage -# id: set-env -# run: | -# if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then -# echo "STAGE=prd" >> $GITHUB_ENV -# echo "::set-output name=stage::prd" -# else -# echo "STAGE=dev" >> $GITHUB_ENV -# echo "::set-output name=stage::dev" -# fi -# - name: Use output -# run: echo "The stage is ${{ steps.set-env.outputs.stage }}" -# - name: Configure AWS credentials -# uses: aws-actions/configure-aws-credentials@v1 -# with: -# role-to-assume: ${{ env.AWS_ROLE_DEV_CICD }} -# aws-region: eu-west-1 -# - name: Create Docker image and push to ECR -# uses: ./.github/actions/image_builder -# id: generate-promethai-docker -# with: -# stage: prd -# aws_account_id: ${{ env.AWS_ACCOUNT_ID_DEV }} -# should_publish: true -# ecr_image_repo_name: promethai-prd-backend-promethai-backend-memory -# dockerfile_location: ./level_2 -# - name: Export Docker image tag -# id: export-promethai-docker-tag -# run: | -# export DOCKER_TAG=$(cat /tmp/.DOCKER_IMAGE_VERSION) -# echo "Docker tag is: $DOCKER_TAG" -# echo "promethai_docker_tag_backend=$DOCKER_TAG" >> $GITHUB_OUTPUT + - name: Set environment variable for stage + id: set-env + run: | + if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then + echo "STAGE=prd" >> $GITHUB_ENV + echo "::set-output name=stage::prd" + else + echo "STAGE=dev" >> $GITHUB_ENV + echo "::set-output name=stage::dev" + fi + - name: Use output + run: echo "The stage is ${{ steps.set-env.outputs.stage }}" + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + role-to-assume: ${{ env.AWS_ROLE_DEV_CICD }} + aws-region: eu-west-1 + - name: Create Docker image and push to ECR + uses: ./.github/actions/image_builder + id: generate-promethai-docker + with: + stage: prd + aws_account_id: ${{ env.AWS_ACCOUNT_ID_DEV }} + should_publish: true + ecr_image_repo_name: promethai-prd-backend-promethai-backend + dockerfile_location: ./ + - name: Export Docker image tag + id: export-promethai-docker-tag + run: | + export DOCKER_TAG=$(cat /tmp/.DOCKER_IMAGE_VERSION) + echo "Docker tag is: $DOCKER_TAG" + echo "promethai_docker_tag_backend=$DOCKER_TAG" >> $GITHUB_OUTPUT # - name: Create Tag and Release # runs-on: ubuntu-latest @@ -78,22 +78,22 @@ jobs: # with: # tag_name: ${{ steps.bump_version_and_push_tag.outputs.tag }} # release_name: Release ${{ steps.bump_version_and_push_tag.outputs.tag }} -# outputs: -# promethai_docker_tag_backend: ${{ steps.export-promethai-docker-tag.outputs.promethai_docker_tag_backend }} + outputs: + promethai_docker_tag_backend: ${{ steps.export-promethai-docker-tag.outputs.promethai_docker_tag_backend }} -# apply_tf: -# name: Trigger terraform apply workflow -# runs-on: ubuntu-latest -# needs: publish_docker_to_ecr -# steps: -# - name: TF apply workflow triggers step -# uses: actions/github-script@v6 -# with: -# github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }} -# script: | -# await github.rest.actions.createWorkflowDispatch({ -# owner: 'topoteretes', -# repo: 'PromethAI-Infra', -# workflow_id: 'terraform.apply.yml', -# ref: 'main' -# }) + apply_tf: + name: Trigger terraform apply workflow + runs-on: ubuntu-latest + needs: publish_docker_to_ecr + steps: + - name: TF apply workflow triggers step + uses: actions/github-script@v6 + with: + github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }} + script: | + await github.rest.actions.createWorkflowDispatch({ + owner: 'topoteretes', + repo: 'PromethAI-Infra', + workflow_id: 'terraform.apply.yml', + ref: 'main' + }) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bc6e7f7c..dba210ac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,6 +20,6 @@ jobs: export SHA_SHORT="$(git rev-parse --short HEAD)" export CUR_DATE="$(date +%Y%m%d%H%M%S)" export VERSION="dev-$CUR_DATE-$SHA_SHORT" - image_name="backend-memory" docker_login="false" version="$VERSION" account="${{ env.AWS_ACCOUNT_ID_DEV }}" app_dir="level_2" publish="false" ./bin/dockerize - export DOCKER_TAG=$(cat level_2/tmp/.DOCKER_IMAGE_VERSION) + image_name="backend" docker_login="false" version="$VERSION" account="${{ env.AWS_ACCOUNT_ID_DEV }}" app_dir="backend" publish="false" ./bin/dockerize + export DOCKER_TAG=$(cat /tmp/.DOCKER_IMAGE_VERSION) echo "Successfully built PromethAI backend Docker tag is: $DOCKER_TAG" diff --git a/level_4/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from level_4/CONTRIBUTING.md rename to CONTRIBUTING.md diff --git a/level_4/Dockerfile b/Dockerfile similarity index 100% rename from level_4/Dockerfile rename to Dockerfile diff --git a/LICENSE b/LICENSE index 655c4b26..261eeb9e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,201 @@ -MIT License - -Copyright (c) 2023 Topoteretes - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/level_4/__init__.py b/__init__.py similarity index 100% rename from level_4/__init__.py rename to __init__.py diff --git a/level_4/api.py b/api.py similarity index 100% rename from level_4/api.py rename to api.py diff --git a/Dashboard_example.png b/assets/Dashboard_example.png similarity index 100% rename from Dashboard_example.png rename to assets/Dashboard_example.png diff --git a/level_4/User_graph.png b/assets/User_graph.png similarity index 100% rename from level_4/User_graph.png rename to assets/User_graph.png diff --git a/infographic_final.png b/assets/infographic_final.png similarity index 100% rename from infographic_final.png rename to assets/infographic_final.png diff --git a/bin/dockerize b/bin/dockerize index a8f46536..30cfede3 100755 --- a/bin/dockerize +++ b/bin/dockerize @@ -8,11 +8,11 @@ STAGE=${stage:-"dev"} SHA_SHORT="$(git rev-parse --short HEAD)" CUR_DATE="$(date +%Y%m%d%H%M%S)" VERSION="$STAGE-$CUR_DATE-$SHA_SHORT" -IMAGE_NAME=${image_name:-promethai-${STAGE}-promethai-backend-memory} +IMAGE_NAME=${image_name:-promethai-${STAGE}-promethai-backend} REPO_NAME="${AWS_REPOSITORY}/${IMAGE_NAME}" FULL_IMAGE_NAME="${REPO_NAME}:${VERSION}" -APP_DIR=${app_dir:-"level_2/"} # Updated this line +APP_DIR=${app_dir:-"."} PUBLISH=${publish:-false} @@ -33,4 +33,4 @@ if [ "${PUBLISH}" = true ]; then fi docker push "${FULL_IMAGE_NAME}" && echo "Successfully pushed docker image ${FULL_IMAGE_NAME} to ECR repository" -fi +fi \ No newline at end of file diff --git a/level_4/cognitive_architecture/__init__.py b/cognitive_architecture/__init__.py similarity index 100% rename from level_4/cognitive_architecture/__init__.py rename to cognitive_architecture/__init__.py diff --git a/level_4/cognitive_architecture/classifiers/__init__.py b/cognitive_architecture/classifiers/__init__.py similarity index 100% rename from level_4/cognitive_architecture/classifiers/__init__.py rename to cognitive_architecture/classifiers/__init__.py diff --git a/level_4/cognitive_architecture/classifiers/classifier.py b/cognitive_architecture/classifiers/classifier.py similarity index 100% rename from level_4/cognitive_architecture/classifiers/classifier.py rename to cognitive_architecture/classifiers/classifier.py diff --git a/level_4/cognitive_architecture/config.py b/cognitive_architecture/config.py similarity index 100% rename from level_4/cognitive_architecture/config.py rename to cognitive_architecture/config.py diff --git a/level_4/cognitive_architecture/database/__init__.py b/cognitive_architecture/database/__init__.py similarity index 100% rename from level_4/cognitive_architecture/database/__init__.py rename to cognitive_architecture/database/__init__.py diff --git a/level_4/cognitive_architecture/database/create_database.py b/cognitive_architecture/database/create_database.py similarity index 100% rename from level_4/cognitive_architecture/database/create_database.py rename to cognitive_architecture/database/create_database.py diff --git a/level_4/cognitive_architecture/database/graph_database/__init__.py b/cognitive_architecture/database/graph_database/__init__.py similarity index 100% rename from level_4/cognitive_architecture/database/graph_database/__init__.py rename to cognitive_architecture/database/graph_database/__init__.py diff --git a/level_4/cognitive_architecture/database/graph_database/graph.py b/cognitive_architecture/database/graph_database/graph.py similarity index 100% rename from level_4/cognitive_architecture/database/graph_database/graph.py rename to cognitive_architecture/database/graph_database/graph.py diff --git a/level_4/cognitive_architecture/database/postgres/__init__.py b/cognitive_architecture/database/postgres/__init__.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/__init__.py rename to cognitive_architecture/database/postgres/__init__.py diff --git a/level_4/cognitive_architecture/database/postgres/database.py b/cognitive_architecture/database/postgres/database.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/database.py rename to cognitive_architecture/database/postgres/database.py diff --git a/level_4/cognitive_architecture/database/postgres/database_crud.py b/cognitive_architecture/database/postgres/database_crud.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/database_crud.py rename to cognitive_architecture/database/postgres/database_crud.py diff --git a/level_4/cognitive_architecture/database/postgres/models/__init__.py b/cognitive_architecture/database/postgres/models/__init__.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/models/__init__.py rename to cognitive_architecture/database/postgres/models/__init__.py diff --git a/level_4/cognitive_architecture/database/postgres/models/docs.py b/cognitive_architecture/database/postgres/models/docs.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/models/docs.py rename to cognitive_architecture/database/postgres/models/docs.py diff --git a/level_4/cognitive_architecture/database/postgres/models/memory.py b/cognitive_architecture/database/postgres/models/memory.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/models/memory.py rename to cognitive_architecture/database/postgres/models/memory.py diff --git a/level_4/cognitive_architecture/database/postgres/models/metadatas.py b/cognitive_architecture/database/postgres/models/metadatas.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/models/metadatas.py rename to cognitive_architecture/database/postgres/models/metadatas.py diff --git a/level_4/cognitive_architecture/database/postgres/models/operation.py b/cognitive_architecture/database/postgres/models/operation.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/models/operation.py rename to cognitive_architecture/database/postgres/models/operation.py diff --git a/level_4/cognitive_architecture/database/postgres/models/sessions.py b/cognitive_architecture/database/postgres/models/sessions.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/models/sessions.py rename to cognitive_architecture/database/postgres/models/sessions.py diff --git a/level_4/cognitive_architecture/database/postgres/models/user.py b/cognitive_architecture/database/postgres/models/user.py similarity index 100% rename from level_4/cognitive_architecture/database/postgres/models/user.py rename to cognitive_architecture/database/postgres/models/user.py diff --git a/level_4/cognitive_architecture/database/vectordb/__init__.py b/cognitive_architecture/database/vectordb/__init__.py similarity index 100% rename from level_4/cognitive_architecture/database/vectordb/__init__.py rename to cognitive_architecture/database/vectordb/__init__.py diff --git a/level_4/cognitive_architecture/database/vectordb/basevectordb.py b/cognitive_architecture/database/vectordb/basevectordb.py similarity index 100% rename from level_4/cognitive_architecture/database/vectordb/basevectordb.py rename to cognitive_architecture/database/vectordb/basevectordb.py diff --git a/level_4/cognitive_architecture/database/vectordb/chunkers/__init__.py b/cognitive_architecture/database/vectordb/chunkers/__init__.py similarity index 100% rename from level_4/cognitive_architecture/database/vectordb/chunkers/__init__.py rename to cognitive_architecture/database/vectordb/chunkers/__init__.py diff --git a/level_4/cognitive_architecture/database/vectordb/chunkers/chunkers.py b/cognitive_architecture/database/vectordb/chunkers/chunkers.py similarity index 100% rename from level_4/cognitive_architecture/database/vectordb/chunkers/chunkers.py rename to cognitive_architecture/database/vectordb/chunkers/chunkers.py diff --git a/level_4/cognitive_architecture/database/vectordb/loaders/__init__.py b/cognitive_architecture/database/vectordb/loaders/__init__.py similarity index 100% rename from level_4/cognitive_architecture/database/vectordb/loaders/__init__.py rename to cognitive_architecture/database/vectordb/loaders/__init__.py diff --git a/level_4/cognitive_architecture/database/vectordb/loaders/loaders.py b/cognitive_architecture/database/vectordb/loaders/loaders.py similarity index 100% rename from level_4/cognitive_architecture/database/vectordb/loaders/loaders.py rename to cognitive_architecture/database/vectordb/loaders/loaders.py diff --git a/level_4/cognitive_architecture/database/vectordb/vectordb.py b/cognitive_architecture/database/vectordb/vectordb.py similarity index 100% rename from level_4/cognitive_architecture/database/vectordb/vectordb.py rename to cognitive_architecture/database/vectordb/vectordb.py diff --git a/level_4/cognitive_architecture/fetch_secret.py b/cognitive_architecture/fetch_secret.py similarity index 100% rename from level_4/cognitive_architecture/fetch_secret.py rename to cognitive_architecture/fetch_secret.py diff --git a/level_4/cognitive_architecture/graph_database/__init__.py b/cognitive_architecture/graph_database/__init__.py similarity index 100% rename from level_4/cognitive_architecture/graph_database/__init__.py rename to cognitive_architecture/graph_database/__init__.py diff --git a/level_4/cognitive_architecture/openai_tools.py b/cognitive_architecture/openai_tools.py similarity index 96% rename from level_4/cognitive_architecture/openai_tools.py rename to cognitive_architecture/openai_tools.py index 3f180edf..68ce05a0 100644 --- a/level_4/cognitive_architecture/openai_tools.py +++ b/cognitive_architecture/openai_tools.py @@ -1,140 +1,140 @@ -import asyncio -import random -import os -import time - - - -HOST = os.getenv("OPENAI_API_BASE") -HOST_TYPE = os.getenv("BACKEND_TYPE") # default None == ChatCompletion - -import openai - -if HOST is not None: - openai.api_base = HOST - - -def retry_with_exponential_backoff( - func, - initial_delay: float = 1, - exponential_base: float = 2, - jitter: bool = True, - max_retries: int = 20, - errors: tuple = (openai.error.RateLimitError,), -): - """Retry a function with exponential backoff.""" - - def wrapper(*args, **kwargs): - # Initialize variables - num_retries = 0 - delay = initial_delay - - # Loop until a successful response or max_retries is hit or an exception is raised - while True: - try: - return func(*args, **kwargs) - - # Retry on specified errors - except errors as e: - # Increment retries - num_retries += 1 - - # Check if max retries has been reached - if num_retries > max_retries: - raise Exception(f"Maximum number of retries ({max_retries}) exceeded.") - - # Increment the delay - delay *= exponential_base * (1 + jitter * random.random()) - - # Sleep for the delay - time.sleep(delay) - - # Raise exceptions for any errors not specified - except Exception as e: - raise e - - return wrapper - - -@retry_with_exponential_backoff -def completions_with_backoff(**kwargs): - # Local model - return openai.ChatCompletion.create(**kwargs) - - -def aretry_with_exponential_backoff( - func, - initial_delay: float = 1, - exponential_base: float = 2, - jitter: bool = True, - max_retries: int = 20, - errors: tuple = (openai.error.RateLimitError,), -): - """Retry a function with exponential backoff.""" - - async def wrapper(*args, **kwargs): - # Initialize variables - num_retries = 0 - delay = initial_delay - - # Loop until a successful response or max_retries is hit or an exception is raised - while True: - try: - return await func(*args, **kwargs) - - # Retry on specified errors - except errors as e: - print(f"acreate (backoff): caught error: {e}") - # Increment retries - num_retries += 1 - - # Check if max retries has been reached - if num_retries > max_retries: - raise Exception(f"Maximum number of retries ({max_retries}) exceeded.") - - # Increment the delay - delay *= exponential_base * (1 + jitter * random.random()) - - # Sleep for the delay - await asyncio.sleep(delay) - - # Raise exceptions for any errors not specified - except Exception as e: - raise e - - return wrapper - - -@aretry_with_exponential_backoff -async def acompletions_with_backoff(**kwargs): - return await openai.ChatCompletion.acreate(**kwargs) - - -@aretry_with_exponential_backoff -async def acreate_embedding_with_backoff(**kwargs): - """Wrapper around Embedding.acreate w/ backoff""" - return await openai.Embedding.acreate(**kwargs) - - -async def async_get_embedding_with_backoff(text, model="text-embedding-ada-002"): - """To get text embeddings, import/call this function - It specifies defaults + handles rate-limiting + is async""" - text = text.replace("\n", " ") - response = await acreate_embedding_with_backoff(input=[text], model=model) - embedding = response["data"][0]["embedding"] - return embedding - - -@retry_with_exponential_backoff -def create_embedding_with_backoff(**kwargs): - return openai.Embedding.create(**kwargs) - - -def get_embedding_with_backoff(text, model="text-embedding-ada-002"): - text = text.replace("\n", " ") - response = create_embedding_with_backoff(input=[text], model=model) - embedding = response["data"][0]["embedding"] - return embedding - - - +import asyncio +import random +import os +import time + + + +HOST = os.getenv("OPENAI_API_BASE") +HOST_TYPE = os.getenv("BACKEND_TYPE") # default None == ChatCompletion + +import openai + +if HOST is not None: + openai.api_base = HOST + + +def retry_with_exponential_backoff( + func, + initial_delay: float = 1, + exponential_base: float = 2, + jitter: bool = True, + max_retries: int = 20, + errors: tuple = (openai.error.RateLimitError,), +): + """Retry a function with exponential backoff.""" + + def wrapper(*args, **kwargs): + # Initialize variables + num_retries = 0 + delay = initial_delay + + # Loop until a successful response or max_retries is hit or an exception is raised + while True: + try: + return func(*args, **kwargs) + + # Retry on specified errors + except errors as e: + # Increment retries + num_retries += 1 + + # Check if max retries has been reached + if num_retries > max_retries: + raise Exception(f"Maximum number of retries ({max_retries}) exceeded.") + + # Increment the delay + delay *= exponential_base * (1 + jitter * random.random()) + + # Sleep for the delay + time.sleep(delay) + + # Raise exceptions for any errors not specified + except Exception as e: + raise e + + return wrapper + + +@retry_with_exponential_backoff +def completions_with_backoff(**kwargs): + # Local model + return openai.ChatCompletion.create(**kwargs) + + +def aretry_with_exponential_backoff( + func, + initial_delay: float = 1, + exponential_base: float = 2, + jitter: bool = True, + max_retries: int = 20, + errors: tuple = (openai.error.RateLimitError,), +): + """Retry a function with exponential backoff.""" + + async def wrapper(*args, **kwargs): + # Initialize variables + num_retries = 0 + delay = initial_delay + + # Loop until a successful response or max_retries is hit or an exception is raised + while True: + try: + return await func(*args, **kwargs) + + # Retry on specified errors + except errors as e: + print(f"acreate (backoff): caught error: {e}") + # Increment retries + num_retries += 1 + + # Check if max retries has been reached + if num_retries > max_retries: + raise Exception(f"Maximum number of retries ({max_retries}) exceeded.") + + # Increment the delay + delay *= exponential_base * (1 + jitter * random.random()) + + # Sleep for the delay + await asyncio.sleep(delay) + + # Raise exceptions for any errors not specified + except Exception as e: + raise e + + return wrapper + + +@aretry_with_exponential_backoff +async def acompletions_with_backoff(**kwargs): + return await openai.ChatCompletion.acreate(**kwargs) + + +@aretry_with_exponential_backoff +async def acreate_embedding_with_backoff(**kwargs): + """Wrapper around Embedding.acreate w/ backoff""" + return await openai.Embedding.acreate(**kwargs) + + +async def async_get_embedding_with_backoff(text, model="text-embedding-ada-002"): + """To get text embeddings, import/call this function + It specifies defaults + handles rate-limiting + is async""" + text = text.replace("\n", " ") + response = await acreate_embedding_with_backoff(input=[text], model=model) + embedding = response["data"][0]["embedding"] + return embedding + + +@retry_with_exponential_backoff +def create_embedding_with_backoff(**kwargs): + return openai.Embedding.create(**kwargs) + + +def get_embedding_with_backoff(text, model="text-embedding-ada-002"): + text = text.replace("\n", " ") + response = create_embedding_with_backoff(input=[text], model=model) + embedding = response["data"][0]["embedding"] + return embedding + + + diff --git a/level_4/cognitive_architecture/presets.py b/cognitive_architecture/presets.py similarity index 100% rename from level_4/cognitive_architecture/presets.py rename to cognitive_architecture/presets.py diff --git a/level_4/cognitive_architecture/shared/__init__.py b/cognitive_architecture/shared/__init__.py similarity index 100% rename from level_4/cognitive_architecture/shared/__init__.py rename to cognitive_architecture/shared/__init__.py diff --git a/level_4/cognitive_architecture/shared/chunk_strategy.py b/cognitive_architecture/shared/chunk_strategy.py similarity index 100% rename from level_4/cognitive_architecture/shared/chunk_strategy.py rename to cognitive_architecture/shared/chunk_strategy.py diff --git a/level_4/cognitive_architecture/utils.py b/cognitive_architecture/utils.py similarity index 100% rename from level_4/cognitive_architecture/utils.py rename to cognitive_architecture/utils.py diff --git a/level_4/cognitive_architecture/vectorstore_manager.py b/cognitive_architecture/vectorstore_manager.py similarity index 100% rename from level_4/cognitive_architecture/vectorstore_manager.py rename to cognitive_architecture/vectorstore_manager.py diff --git a/level_4/docker-compose.yml b/docker-compose.yml similarity index 100% rename from level_4/docker-compose.yml rename to docker-compose.yml diff --git a/level_4/entrypoint.sh b/entrypoint.sh similarity index 100% rename from level_4/entrypoint.sh rename to entrypoint.sh diff --git a/level_4/.data/BartlebyTheScrivener.pdf b/level_4/.data/BartlebyTheScrivener.pdf deleted file mode 100644 index 1a38dd3d..00000000 Binary files a/level_4/.data/BartlebyTheScrivener.pdf and /dev/null differ diff --git a/level_4/LICENSE b/level_4/LICENSE deleted file mode 100644 index 261eeb9e..00000000 --- a/level_4/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/level_4/bin/dockerize b/level_4/bin/dockerize deleted file mode 100755 index 30cfede3..00000000 --- a/level_4/bin/dockerize +++ /dev/null @@ -1,36 +0,0 @@ -set -euo pipefail - -AWS_REGION=${region:-eu-west-1} -AWS_DEPLOYMENT_ACCOUNT=${account:-463722570299} -AWS_REPOSITORY=${repo:-"${AWS_DEPLOYMENT_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com"} - -STAGE=${stage:-"dev"} -SHA_SHORT="$(git rev-parse --short HEAD)" -CUR_DATE="$(date +%Y%m%d%H%M%S)" -VERSION="$STAGE-$CUR_DATE-$SHA_SHORT" -IMAGE_NAME=${image_name:-promethai-${STAGE}-promethai-backend} - -REPO_NAME="${AWS_REPOSITORY}/${IMAGE_NAME}" -FULL_IMAGE_NAME="${REPO_NAME}:${VERSION}" -APP_DIR=${app_dir:-"."} - -PUBLISH=${publish:-false} - -echo "Building docker image ${FULL_IMAGE_NAME} located in dir ${app_dir}" - -pushd "${APP_DIR}" && - docker buildx build --platform linux/amd64 \ - --build-arg STAGE=${STAGE} \ - -t "${FULL_IMAGE_NAME}" . && - echo "${VERSION}" >/tmp/.DOCKER_IMAGE_VERSION && - echo "Successfully built docker image ${FULL_IMAGE_NAME}" - -if [ "${PUBLISH}" = true ]; then - echo "Pushing docker image ${FULL_IMAGE_NAME} to ECR repository to AWS account ${AWS_DEPLOYMENT_ACCOUNT}" - if [ "${PUBLISH}" = true ]; then - echo "logging in" - aws ecr get-login-password --region "${AWS_REGION}" | docker login --username AWS --password-stdin "${AWS_REPOSITORY}" - fi - docker push "${FULL_IMAGE_NAME}" && - echo "Successfully pushed docker image ${FULL_IMAGE_NAME} to ECR repository" -fi \ No newline at end of file diff --git a/level_4/main.py b/main.py similarity index 100% rename from level_4/main.py rename to main.py diff --git a/level_4/poetry.lock b/poetry.lock similarity index 100% rename from level_4/poetry.lock rename to poetry.lock diff --git a/level_4/pyproject.toml b/pyproject.toml similarity index 100% rename from level_4/pyproject.toml rename to pyproject.toml