Merge pull request #42 from FullStackWithLawrence/next

fix: add missing actions

Author: lpm0073

.github/actions/merge-branch/action.yml

@@ -0,0 +1,59 @@
+---
+#------------------------------------------------------------------------------
+# Run pre-commit
+#------------------------------------------------------------------------------
+name: Merge
+branding:
+  icon: "git-pull-request"
+  color: "orange"
+inputs:
+  github-token:
+    description: "The GitHub token to use for authentication"
+    required: true
+    type: string
+  source-branch:
+    description: "The branch to merge from"
+    required: false
+    type: string
+    default: "main"
+  target-branch:
+    description: "The branch to merge to"
+    required: true
+    type: string
+
+  python-version:
+    description: "The version of Python to use, such as 3.11.0"
+    required: true
+    type: string
+
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout code
+      id: checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+
+    - name: Remember current branch
+      shell: bash
+      run: |
+        echo "CURRENT_BRANCH=$(git branch --show-current)" >> $GITHUB_ENV
+
+    - name: Merge
+      id: merge
+      shell: bash
+      run: |
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+        git checkout ${{ inputs.source-branch }}
+        git pull
+        git checkout ${{ inputs.target-branch }}
+        git merge -Xtheirs ${{ inputs.source-branch }}
+        git push https://${{ inputs.github-token }}@github.com/${{ github.repository }}.git HEAD:${{ inputs.target-branch }}
+
+    - name: Checkout current branch
+      shell: bash
+      run: |
+        git checkout ${{ env.CURRENT_BRANCH }}

.github/actions/tests/python/action.yml

@@ -0,0 +1,95 @@
+---
+#------------------------------------------------------------------------------
+# Run Python unit tests
+#------------------------------------------------------------------------------
+name: Test Python
+branding:
+  icon: "git-pull-request"
+  color: "orange"
+inputs:
+  python-version:
+    description: "The version of Python to use, such as 3.11.0"
+    required: true
+    type: string
+  openai-api-organization:
+    description: "The OpenAI API organization"
+    required: true
+    type: string
+  openai-api-key:
+    description: "The OpenAI API key"
+    required: true
+    type: string
+  pinecone-api-key:
+    description: "The Pinecone API key"
+    required: true
+    type: string
+  pinecone-environment:
+    description: "The Pinecone environment"
+    required: true
+    type: string
+  pinecone-index-name:
+    description: "The Pinecone index name"
+    required: true
+    type: string
+
+env:
+  REQUIREMENTS_PATH: "api/terraform/python/layer_genai/requirements.txt"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout code
+      id: checkout
+      uses: actions/checkout@v4
+
+    - name: Cache Python dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ inputs.python-version }}
+
+    - name: locate site-packages path
+      shell: bash
+      run: |
+        echo "SITE_PACKAGES_PATH=$(python -c 'import site; print(site.getsitepackages()[0])')" >> $GITHUB_ENV
+
+    - name: Install pip
+      shell: bash
+      run: |
+        python -m pip install --upgrade pip
+
+    - name: Install dependencies
+      shell: bash
+      run: |
+        pip install -r ./requirements.txt
+      env:
+        SITE_PACKAGES_PATH: ${{ env.SITE_PACKAGES_PATH }}
+
+    - name: Create .env
+      shell: bash
+      run: |
+        touch ./.env
+        echo "OPENAI_API_ORGANIZATION=${{ env.OPENAI_API_ORGANIZATION }}" >> ./.env
+        echo "OPENAI_API_KEY=${{ env.OPENAI_API_KEY }}" >> ./.env
+        echo "PINECONE_API_KEY=${{ env.PINECONE_API_KEY }}" >> ./.env
+        echo "PINECONE_ENVIRONMENT=${{ env.PINECONE_ENVIRONMENT }}" >> ./.env
+        echo "PINECONE_INDEX_NAME=${{ env.PINECONE_INDEX_NAME }}" >> ./.env
+      env:
+        OPENAI_API_ORGANIZATION: ${{ inputs.openai-api-organization }}
+        OPENAI_API_KEY: ${{ inputs.openai-api-key }}
+        PINECONE_API_KEY: ${{ inputs.pinecone-api-key }}
+        PINECONE_ENVIRONMENT: ${{ inputs.pinecone-environment }}
+        PINECONE_INDEX_NAME: ${{ inputs.pinecone-index-name }}
+
+    - name: Run Tests
+      shell: bash
+      run: |
+        cd models && pytest -v -s tests/
+        python -m setup_test

secure_logger/__version__.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.1.17"
+__version__ = "0.1.18-next.1"