Merge pull request #208 from FullStackWithLawrence/next

lint

Author: lpm0073

.flake8

@@ -1,2 +1,7 @@
 [flake8]
-max-line-length = 120
+ignore = D205,D413,D400,D401
+max-line-length =120
+max-complexity = 10
+exclude = "api/terraform/python/layer_genai/venv"
+extend-exclude = "*__init__.py,*__version__.py,venv,lambda_dist_pkg"
+select = "C101"

.pylintrc

@@ -1,8 +1,4 @@
 [MASTER]
-ignore-paths =
-  api/terraform/python/lambda_openai_v2/lambda_dist_pkg,
-  api/terraform/python/lambda_openai/lambda_dist_pkg,
-  api/terraform/python/lambda_langchain/lambda_dist_pkg
 ignore =
   __version__.py
 

CHANGELOG.md

@@ -1,23 +1,21 @@
 # [0.7.0](https://github.com/FullStackWithLawrence/aws-openai/compare/v0.6.5...v0.7.0) (2023-12-18)
 
-
 ### Bug Fixes
 
-* version writer was skipping first two lines ([5be9cf2](https://github.com/FullStackWithLawrence/aws-openai/commit/5be9cf2f313de60b4d5dfd64fcbd080194cff03c))
-
+- version writer was skipping first two lines ([5be9cf2](https://github.com/FullStackWithLawrence/aws-openai/commit/5be9cf2f313de60b4d5dfd64fcbd080194cff03c))
 
 ### Features
 
-* add lists of .env and terraform.tfvars variables in use for settings ([ed64c74](https://github.com/FullStackWithLawrence/aws-openai/commit/ed64c74bfd7fdd7a99f684b5a22c65c1c1fc7a58))
-* add openai and langchain parameters to unit tests ([d19af9f](https://github.com/FullStackWithLawrence/aws-openai/commit/d19af9fa108df885f091e23057f38e15f1df9552))
-* add properties to report whether .env and/or terraform.tfvars files are in use ([5e3bea6](https://github.com/FullStackWithLawrence/aws-openai/commit/5e3bea603af3a9e96bb35ec601924edbe8e7d305))
-* add Settings class and refactor ([b9f0286](https://github.com/FullStackWithLawrence/aws-openai/commit/b9f028632622c5a81eeee7bc8b5fe920d72a5bed))
-* add unit test for langchain ([9a2b00d](https://github.com/FullStackWithLawrence/aws-openai/commit/9a2b00d903a8a6b097b52364b3fe4dd449cb165c))
-* add unit tests for common ([cf3ac81](https://github.com/FullStackWithLawrence/aws-openai/commit/cf3ac81e2c2db889f2bcaaa43365af92e0437ca6))
-* add unit tests for lambda_langchain ([4d94a87](https://github.com/FullStackWithLawrence/aws-openai/commit/4d94a875ea968dff85c48f6316fcd6ace5b31033))
-* add unit tests for lambda_openai_v2 ([1b1a2c9](https://github.com/FullStackWithLawrence/aws-openai/commit/1b1a2c9d24d834e06d2d747845d1562b826437e5))
-* refactor for OpenAI API v1 ([7fb6809](https://github.com/FullStackWithLawrence/aws-openai/commit/7fb6809a627eb8451af0054f24bd51bf3b52e07f))
-* run Python unit tests on all pushes ([4957f63](https://github.com/FullStackWithLawrence/aws-openai/commit/4957f63028058504c11249b1c01a6ca28dd2bce1))
+- add lists of .env and terraform.tfvars variables in use for settings ([ed64c74](https://github.com/FullStackWithLawrence/aws-openai/commit/ed64c74bfd7fdd7a99f684b5a22c65c1c1fc7a58))
+- add openai and langchain parameters to unit tests ([d19af9f](https://github.com/FullStackWithLawrence/aws-openai/commit/d19af9fa108df885f091e23057f38e15f1df9552))
+- add properties to report whether .env and/or terraform.tfvars files are in use ([5e3bea6](https://github.com/FullStackWithLawrence/aws-openai/commit/5e3bea603af3a9e96bb35ec601924edbe8e7d305))
+- add Settings class and refactor ([b9f0286](https://github.com/FullStackWithLawrence/aws-openai/commit/b9f028632622c5a81eeee7bc8b5fe920d72a5bed))
+- add unit test for langchain ([9a2b00d](https://github.com/FullStackWithLawrence/aws-openai/commit/9a2b00d903a8a6b097b52364b3fe4dd449cb165c))
+- add unit tests for common ([cf3ac81](https://github.com/FullStackWithLawrence/aws-openai/commit/cf3ac81e2c2db889f2bcaaa43365af92e0437ca6))
+- add unit tests for lambda_langchain ([4d94a87](https://github.com/FullStackWithLawrence/aws-openai/commit/4d94a875ea968dff85c48f6316fcd6ace5b31033))
+- add unit tests for lambda_openai_v2 ([1b1a2c9](https://github.com/FullStackWithLawrence/aws-openai/commit/1b1a2c9d24d834e06d2d747845d1562b826437e5))
+- refactor for OpenAI API v1 ([7fb6809](https://github.com/FullStackWithLawrence/aws-openai/commit/7fb6809a627eb8451af0054f24bd51bf3b52e07f))
+- run Python unit tests on all pushes ([4957f63](https://github.com/FullStackWithLawrence/aws-openai/commit/4957f63028058504c11249b1c01a6ca28dd2bce1))
 
 # Change Log
 

Makefile

@@ -27,14 +27,12 @@ pre-commit:
 	pre-commit autoupdate
 	pre-commit run --all-files
 
-######################
-# AWS API Gateway + Lambda + OpenAI
-######################
+# ---------------------------------------------------------
+# create python virtual environments for dev as well
+# as for the Lambda layer.
+# ---------------------------------------------------------
 api-init:
-	# ---------------------------------------------------------
-	# create python virtual environments for dev as well
-	# as for the Lambda layer.
-	# ---------------------------------------------------------
+	make api-clean
 	npm install && \
 	python3.11 -m venv venv && \
 	source venv/bin/activate && \
@@ -49,20 +47,22 @@ api-init:
 	deactivate && \
 	pre-commit install
 
-api-activate:
-	. venv/bin/activate && \
-	pip install -r requirements.txt
-
 api-test:
 	python -m unittest discover -s api/terraform/python/openai_api/
 
 api-lint:
 	terraform fmt -recursive
 	pre-commit run --all-files
 	black ./api/terraform/python/
+	flake8 api/terraform/python/
+	pylint api/terraform/python/openai_api/**/*.py
 
 api-clean:
 	rm -rf venv
+	rm -rf ./api/terraform/python/layer_genai/venv
+	rm -rf ./api/terraform/build/
+	mkdir -p ./api/terraform/build/
+	find ./api/terraform/python/ -name __pycache__ -type d -exec rm -rf {} +
 
 ######################
 # React app
@@ -123,7 +123,6 @@ help:
 	@echo 'release             - force a new release'
 	@echo '-- AWS API Gateway + Lambda --'
 	@echo 'api-init            - create a Python virtual environment and install dependencies'
-	@echo 'api-activate        - activate the Python virtual environment'
 	@echo 'api-test            - run Python unit tests'
 	@echo 'api-lint            - run Python linting'
 	@echo 'api-clean           - destroy the Python virtual environment'

api/terraform/python/layer_genai/Dockerfile

@@ -8,8 +8,6 @@ FROM --platform=linux/amd64 public.ecr.aws/lambda/python:3.11
 WORKDIR /var/task
 
 COPY requirements.txt .
-COPY openai_utils ./openai_utils
 
 RUN yum install -y zip
 RUN pip install -r requirements.txt --target python/lib/python3.11/site-packages
-RUN cp -R openai_utils python/lib/python3.11/site-packages

api/terraform/python/layer_genai/README.md

@@ -1,3 +1,3 @@
 # AWS Lambda Layer for OpenAI/Langchain Lambdas
 
-This layer contains the combined pip requirements for both lambda_langchain and lambda_openai.
+This layer contains the combined pip requirements for both lambda_langchain and lambda_openai_v2.

api/terraform/python/layer_genai/create_container.sh

@@ -13,13 +13,6 @@
 #------------------------------------------------------------------------------
 cd $SOURCE_CODE_PATH
 
-# we have to phyically copy the python module(s) to the dist venv site-packages folder
-# because we're installing this package as an executate and pip therefore won't
-# copy the module(s) to the site-packages folder for us.
-cp -R $PARENT_DIRECTORY/openai_utils/ $SOURCE_CODE_PATH/venv/lib/python3.11/site-packages/
-cp -rf SOURCE_CODE_PATH/venv/lib/python3.11/site-packages/openai_utils/__pycache__
-cp -rf SOURCE_CODE_PATH/venv/lib/python3.11/site-packages/openai_utils/openai_utils.egg-info
-cp -rf SOURCE_CODE_PATH/venv/lib/python3.11/openai_utils/tests
 
 docker build -t $CONTAINER_NAME .
 docker rm $CONTAINER_NAME

api/terraform/python/layer_genai/requirements.txt

@@ -9,6 +9,9 @@
 # -----------------------------------------------------------------------------
 python-dotenv==1.0.0
 openai==1.5.0
-langchain==0.0.350
-langchain-experimental==0.0.47
+langchain
+langchain-experimental
 pinecone-client==2.2.4
+pydantic==2.5.2
+pydantic-settings==2.1.0
+python-dotenv==1.0.0

api/terraform/python/openai_api/__version__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # DO NOT EDIT.
 # Managed via automated CI/CD in .github/workflows/semanticVersionBump.yml.
-__version__ = "0.7.0"
+__version__ = "0.7.1"

api/terraform/terraform.tfvars

@@ -16,7 +16,7 @@ tags = {
   "project"   = "OpenAI Code Samples"
   "contact"   = "YOUR CONTACT INFORMATION GOES HERE."
 }
-aws_region  = "us-east-1"
+aws_region = "us-east-1"
 # aws_profile = "default"
 
 ###############################################################################

pyproject.toml

@@ -1,6 +1,3 @@
-[build-system]
-requires = ["flake8", "gitlint", "bump2version"]
-
 [tool.isort]
 profile = "black"
 lines_after_imports = 2
@@ -25,11 +22,3 @@ exclude = '''
   | lambda_dist_pkg
 )/
 '''
-
-[tool.flake8]
-ignore = "D205,D413,D400,D401"
-max-line-length =120
-max-complexity = 10
-exclude = "api/terraform/python/lambda_openai/venv, api/terraform/python/lambda_openai/lambda_dist_pkg, api/terraform/python/lambda_openai_v2/lambda_dist_pkg, api/terraform/python/lambda_langchain/lambda_dist_pkg"
-extend-exclude = "*__init__.py,*__version__.py,venv,lambda_dist_pkg"
-select = "C101"

tox.ini

@@ -6,7 +6,7 @@ skip_missing_interpreters = true
 
 [tool.isort]
 profile = "black"
-skip =venv,node_modules,api/terraform/python/lambda_openai/lambda_dist_pkg,api/terraform/python/lambda_openai/venv
+skip =venv,node_modules,api/terraform/python/layer_genai/venv
 
 [gh-actions]
 python =