Merge pull request #35 from paulparkinson/main

paulparkinson · web-flow · commit 2eb2923c42e6 · 2024-08-12T20:36:58.000-04:00
security/version fixes, strip superfluous "select ai", etc.
diff --git a/python-rag-chatbot/requirements.txt b/python-rag-chatbot/requirements.txt
@@ -18,14 +18,12 @@ backcall==0.2.0
 backoff==2.2.1
 bcrypt==4.0.1
 beautifulsoup4==4.12.2
-black==23.9.1
 bleach==6.1.0
 blinker==1.6.3
 boto3==1.34.115
 botocore==1.34.115
 build==1.2.1
 cachetools==5.3.1
-certifi==2023.7.22
 cffi==1.16.0
 chardet==5.2.0
 charset-normalizer==3.3.0
@@ -34,37 +32,37 @@ chroma-hnswlib==0.7.3
 chromadb==0.4.14
 circuitbreaker==1.4.0
 click==8.1.7
-cohere==4.27
+cohere==5.5
 colorama==0.4.6
 coloredlogs==15.0.1
 comm==0.1.4
 contourpy==1.2.1
-cryptography==42.0.4
+cryptography==38.0.0
 cycler==0.12.1
 dataclasses-json==0.6.1
 debugpy==1.8.0
 decorator==5.1.1
 defusedxml==0.7.1
 Deprecated==1.2.14
-dnspython==                                2.6.1
-docutils ==                                0.21.2
-email_validator==                        2.1.1
-emoji==                                    2.8.0
-exceptiongroup==                           1.1.3
-executing==                                2.0.0
-fastavro==                                 1.8.2
-fastjsonschema==                           2.18.1
-filelock==                                 3.12.4
-filetype==                                 1.2.0
-flatbuffers==                              23.5.26
-fonttools==                                4.52.4
-fqdn==                                     1.5.1
-frozenlist==                               1.4.0
-fsspec==                                   2023.9.2
-gitdb==                                    4.0.11
-GitPython==                                3.1.41
-google-auth==                              2.29.0
-googleapis-common-protos==                 1.63.0
+dnspython==2.6.1
+docutils==0.21.2
+email_validator==2.1.1
+emoji==2.8.0
+exceptiongroup==1.1.3
+executing==2.0.0
+fastavro==1.9.5
+fastjsonschema==2.18.1
+filelock==3.12.4
+filetype==1.2.0
+flatbuffers==23.5.26
+fonttools==4.52.4
+fqdn==1.5.1
+frozenlist==1.4.0
+fsspec==2023.9.2
+gitdb==4.0.11
+GitPython==3.1.41
+google-auth==2.29.0
+googleapis-common-protos==1.63.0
 greenlet==                                 3.0.3
 grpcio==                                   1.59.0
 h11==                                      0.14.0
@@ -75,49 +73,36 @@ httpx==                                    0.27.0
 httpx-sse==                                0.4.0
 huggingface-hub==                          0.23.2
 humanfriendly==                            10.0
-idna==                                     3.4
 importlib-metadata==                       6.8.0
 importlib-resources==                      6.1.0
 inference-tools==                          0.13.0
-install==                                  1.3.5
 IProgress==                                0.4
 ipykernel==                                6.25.2
 ipython==                                  8.16.1
 ipywidgets==                               8.1.1
 isoduration==                              20.11.0
 jedi==                                     0.19.1
-Jinja2==                                   3.1.3
 jmespath==                                 1.0.1
 joblib==                                   1.3.2
 json5==                                    0.9.14
 jsonpatch==                                1.33
 jsonpointer==                              2.4
 jsonschema==                               4.19.1
-jsonschema-specifications==                2023.7.1
-jupyter_client==                           8.4.0
-jupyter_core==                             5.4.0
-jupyter-events==                           0.7.0
-jupyter-lsp==                              2.2.2
-jupyter_server==                           2.7.3
-jupyter_server_terminals==                 0.4.4
-jupyterlab==                               4.1.0b2
-jupyterlab-pygments==                      0.2.2
-jupyterlab_server==                        2.25.0
-jupyterlab-widgets==                       3.0.9
-kiwisolver==                               1.4.5
-kubernetes==                               29.0.0
-langchain==                                0.2.1
-langchain-cli==                            0.0.24
-langchain-cohere==                         0.1.5
-langchain-community==                      0.2.1
-langchain-core==                           0.2.2
-langchain-text-splitters==                 0.2.0
-langchainhub==                             0.1.13
-langdetect==                               1.0.9
-langserve==                                0.2.1
-langsmith==                                0.1.67
-libcst==                                   1.4.0
-log-symbols==                              0.0.14
+jsonschema-specifications==2023.7.1
+kiwisolver==1.4.5
+kubernetes==29.0.0
+langchain==0.2.1
+langchain-cli==0.0.24
+langchain-cohere==0.1.5
+langchain-community==0.2.1
+langchain-core==0.2.2
+langchain-text-splitters==0.2.0
+langchainhub==0.1.13
+langdetect==1.0.9
+langserve==0.2.1
+langsmith==0.1.67
+libcst==1.4.0
+log-symbols==0.0.14
 loguru==                                   0.7.2
 lxml==                                     4.9.3
 markdown-it-py==                           3.0.0
@@ -139,7 +124,6 @@ nbconvert==                                7.9.2
 nbformat==                                 5.9.2
 nest-asyncio==                             1.5.8
 networkx==                                 3.1
-nltk==                                     3.8.1
 notebook_shim==                            0.2.3
 numpy==                                    1.26.1
 oauthlib==                                 3.2.2
@@ -170,7 +154,6 @@ pathspec==                                 0.11.2
 pexpect==                                  4.8.0
 pickleshare==                              0.7.5
 piglet-templates==                         1.3.1
-Pillow==                                   10.1.0
 pip==                                      24.1.1
 platformdirs==                             3.11.0
 posthog==                                  3.0.2
@@ -207,17 +190,13 @@ pyzmq==                                    25.1.1
 rapidfuzz==                                3.4.0
 referencing==                              0.30.2
 regex==2023.10.3
-requests==2.31.0
-requests-oauth2==0.3.0
-requests-oauthlib==2.0.0
 rfc3339-validator==0.1.4
 rfc3986-validator==0.1.1
 rich==13.6.0
 rpds-py==0.10.6
 rsa==4.9
 s3transfer==0.10.1
 safetensors==0.4.3
-scikit-learn==1.3.1
 scipy==1.11.3
 section==2.0
 Send2Trash==1.8.2
@@ -248,8 +227,6 @@ tomlkit==0.12.5
 toolz==0.12.0
 torch==2.2.2
 torchvision==0.17.2
-tornado==6.3.3
-tqdm==4.66.1
 traitlets==5.11.2
 transformers==4.41.2
 trubrics==1.6.2
@@ -263,7 +240,6 @@ tzlocal==5.2
 ujson==5.10.0
 unstructured==0.10.23
 uri-template==1.3.0
-urllib3==2.0.7
 uvicorn==0.23.2
 uvloop==0.18.0
 validators==0.22.0
diff --git a/python-realtimespeech-selectai/README.md b/python-realtimespeech-selectai/README.md
@@ -4,4 +4,5 @@ located here: https://livelabs.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop
 Quick notes are here...
 - setup the database side with Select AI configured, etc.
 - oci session authenticate ; oci iam region list --config-file ~/.oci/config --profile MYSPEECHAIPROFILE --auth security_token
+- $env:COMPARTMENT_ID = "ocid1.compartment.oc1..YOURCOMPARMENTID"
 - python src/RealtimeSpeechSelectAI.py
diff --git a/python-realtimespeech-selectai/src/RealtimeSpeechSelectAI.py b/python-realtimespeech-selectai/src/RealtimeSpeechSelectAI.py
@@ -94,8 +94,10 @@ def on_result(self, result):
             print(f"Received final results: {transcription}")
             print(f"Current cummulative result: {cummulativeResult}")
             if cummulativeResult.lower().startswith("select ai"):
+                cummulativeResult = cummulativeResult[len("select ai"):].strip()
                 isSelect = True
-            elif cummulativeResult.lower().startswith("Select the eye"):
+            elif cummulativeResult.lower().startswith("select the eye"):
+                cummulativeResult = cummulativeResult[len("select the eye"):].strip()
                 isSelect = True
             else:
                 cummulativeResult = ""
@@ -133,30 +135,26 @@ def executeSelectAI():
     global cummulativeResult, isInsertResults, latest_thetime, latest_question, latest_answer
     print(f"executeSelectAI called cummulative result: {cummulativeResult}")
 
-    # AI query
+    # AI query - todo use openai_gpt4o
     query = """SELECT DBMS_CLOUD_AI.GENERATE(
                 prompt       => :prompt,
-                profile_name => 'openai_gpt35',
+                profile_name => 'openai_gpt35', 
                 action       => 'narrate')
             FROM dual"""
 
     try:
         with connection.cursor() as cursor:
-            # Execute AI query
             cursor.execute(query, prompt=cummulativeResult)
             result = cursor.fetchone()
-
             if result and isinstance(result[0], oracledb.LOB):
                 text_result = result[0].read()
                 print(text_result)
 
-                # Update the global variables
                 latest_thetime = datetime.now()
                 latest_question = cummulativeResult
                 latest_answer = text_result[:3000]  # Truncate if necessary
                 cummulativeResult = ""
 
-                # Insert the prompt and result into the table if isInsertResults is True
                 if isInsertResults:
                     insert_query = """
                     INSERT INTO selectai_data (thetime, question, answer)
@@ -174,7 +172,6 @@ def executeSelectAI():
     except Exception as e:
         print(f"An error occurred: {e}")
 
-    # Reset cumulativeResult after execution
     cummulativeResult = ""
 
 async def handle_request(request):
@@ -231,4 +228,4 @@ def message_callback(message):
     if stream.is_active():
         stream.close()
 
-    print("Closed now")
+    print("Closed")
