updating with new langchain

AllInOneApp/Chat-GPT-LangChain/app.py

@@ -246,7 +246,7 @@ def load_chain(history):
     print("langchain reloaded")
     history = []
     history.append(("Show me what you got!", "Hi Human, I am ready to serve!"))    
-    return history, history, chain
+    return history, history, chain, gr.Textbox.update(visible=True), gr.Button.update(visible=True), gr.UploadButton.update(visible=True)
 
 
 def run_chain(chain, inp):
@@ -325,10 +325,32 @@ def add_image(state, chain, image):
     # Image_N
     # wget http://0.0.0.0:7860/file=/tmp/bananabdzk2eqi.jpg
     # url_input_for_chain = "Image_{} http://0.0.0.0:7860/file={}".format(IMAGE_COUNT, image.name)
+
+
+    # ############################################
+    # # move the file name to uuid based instead of real name
+    # image_path = image.name
+    # file_dir = os.path.dirname(image_path)
+    # split_tup = os.path.splitext(image_path)
+    # fileExtension = split_tup[1]
+    # new_file_name = str(uuid.uuid1())[:10] + fileExtension
+    
+
+    # # make dir at app level if not exist
+    # app_level_folder = 'static/'
+    # if not os.path.exists(app_level_folder):
+    #     os.makedirs(app_level_folder + file_dir)
+    # new_file_path = app_level_folder + file_dir + "/" + new_file_name
+
+    # shutil.copyfile(image_path, new_file_path)
+    # os.remove(image_path)
+    # ######################################
+
+
     url_input_for_chain = "http://0.0.0.0:{}/file={}".format(ARGS.port, image.name)
 
     # !!!!!! quick HACK to refer to image in this server for image editing pruprose
-    # url_input_for_chain = url_input_for_chain.replace("0.0.0.0", "10.123.124.92")
+    url_input_for_chain = url_input_for_chain.replace("0.0.0.0", "10.123.124.92")
 
 
     ########################
@@ -378,9 +400,10 @@ def process_chain_output(outputs):
                 if "assistant: here is the edited image " in output.lower():
                     img_url = replace_with_image_markup(output)
                     cleanOutputs.append("Assistant: Here is the edited image")
-                if img_url is not None:
-                    cleanOutputs.append((img_url,))
-                cleanOutputs.append(output)
+                    if img_url is not None:
+                        cleanOutputs.append((img_url,))
+                else:
+                    cleanOutputs.append(output)
                 # cleanOutputs = cleanOutputs + output+ "."
             outputs = cleanOutputs
     
@@ -403,7 +426,7 @@ def init_and_kick_off():
 
         
         
-        reset_btn = gr.Button(value="!!!CLICK to wake up the AI!!!", variant="secondary", elem_id="resetbtn").style(full_width=False)
+        reset_btn = gr.Button(value="!!!CLICK to wake up the AI!!!", variant="secondary", elem_id="resetbtn").style(full_width=True)
 
         with gr.Row():
             chatbot = gr.Chatbot(elem_id="chatbot").style(height=620)
@@ -412,20 +435,20 @@ def init_and_kick_off():
             with gr.Column(scale=0.75):
                 message = gr.Textbox(label="What's on your mind??",
                                         placeholder="What's the answer to life, the universe, and everything?",
-                                        lines=1)
+                                        lines=1, visible=False)
             with gr.Column(scale=0.15):
-                submit = gr.Button(value="Send", variant="secondary").style(full_width=False)
+                submit = gr.Button(value="Send", variant="secondary", visible=False).style(full_width=True)
             with gr.Column(scale=0.10, min_width=0):
-                btn = gr.UploadButton("📁", file_types=["image"])
+                btn = gr.UploadButton("📁", file_types=["image"], visible=False).style(full_width=True)
                 # btn = gr.UploadButton("📁", file_types=["image", "video", "audio"])
         
-        with gr.Row():
-            with gr.Column(scale=0.90):
-                gr.HTML("""
-                    <p>This application, developed by Cognitive Service Team Microsoft, demonstrates all cognitive service APIs in a conversational agent
-                    </p>""")
-            # with gr.Column(scale=0.10):
-            #     reset_btn = gr.Button(value="Initiate Chat", variant="secondary", elem_id="resetbtn").style(full_width=False)
+        # with gr.Row():
+        #     with gr.Column(scale=0.90):
+        #         gr.HTML("""
+        #             <p>This application, developed by Cognitive Service Team Microsoft, demonstrates all cognitive service APIs in a conversational agent
+        #             </p>""")
+        #     # with gr.Column(scale=0.10):
+        #     #     reset_btn = gr.Button(value="Initiate Chat", variant="secondary", elem_id="resetbtn").style(full_width=False)
 
         message.submit(chat, inputs=[message, history_state, chain_state],
                     outputs=[chatbot, history_state, message])
@@ -440,7 +463,7 @@ def init_and_kick_off():
         #                           inputs=[openai_api_key_textbox],
         #                           outputs=[chain_state])
         # load the chain    
-        reset_btn.click(load_chain, inputs=[history_state], outputs=[chatbot, history_state, chain_state])
+        reset_btn.click(load_chain, inputs=[history_state], outputs=[chatbot, history_state, chain_state, message, submit, btn])
         
 
 

AllInOneApp/langchain/.github/workflows/linkcheck.yml

@@ -1,36 +0,0 @@
-name: linkcheck
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-
-env:
-  POETRY_VERSION: "1.3.1"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version:
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install poetry
-        run: |
-          pipx install poetry==$POETRY_VERSION
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: poetry
-      - name: Install dependencies
-        run: |
-          poetry install --with docs
-      - name: Build the docs
-        run: |
-          make docs_build
-      - name: Analyzing the docs with linkcheck
-        run: |
-          make docs_linkcheck

AllInOneApp/langchain/.github/workflows/lint.yml

@@ -1,36 +0,0 @@
-name: lint
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-
-env:
-  POETRY_VERSION: "1.3.1"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install poetry
-        run: |
-          pipx install poetry==$POETRY_VERSION
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: poetry
-      - name: Install dependencies
-        run: |
-          poetry install
-      - name: Analysing the code with our lint
-        run: |
-          make lint

AllInOneApp/langchain/.github/workflows/release.yml

@@ -1,49 +0,0 @@
-name: release
-
-on:
-  pull_request:
-    types:
-      - closed
-    branches:
-      - master
-    paths:
-      - 'pyproject.toml'
-
-env:
-  POETRY_VERSION: "1.3.1"
-
-jobs:
-  if_release:
-    if: |
-        ${{ github.event.pull_request.merged == true }}
-        && ${{ contains(github.event.pull_request.labels.*.name, 'release') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install poetry
-        run: pipx install poetry==$POETRY_VERSION
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-          cache: "poetry"
-      - name: Build project for distribution
-        run: poetry build
-      - name: Check Version
-        id: check-version
-        run: |
-          echo version=$(poetry version --short) >> $GITHUB_OUTPUT
-      - name: Create Release
-        uses: ncipollo/release-action@v1
-        with:
-          artifacts: "dist/*"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          draft: false
-          generateReleaseNotes: true
-          tag: v${{ steps.check-version.outputs.version }}
-          commit: master
-      - name: Publish to PyPI
-        env:
-          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_API_TOKEN }}
-        run: | 
-          poetry publish

AllInOneApp/langchain/.github/workflows/test.yml

@@ -1,34 +0,0 @@
-name: test
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-
-env:
-  POETRY_VERSION: "1.3.1"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install poetry
-        run: pipx install poetry==$POETRY_VERSION
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "poetry"
-      - name: Install dependencies
-        run: poetry install
-      - name: Run unit tests
-        run: |
-          make test

AllInOneApp/langchain/langchain/agents/assistant/base.py

@@ -115,7 +115,7 @@ class AssistantAgent(Agent):
             if action_input.endswith((".", "?")):
                 action_input = action_input[:-1]
             if "/" not in action_input and "http" not in action_input:
-                return "Final Answer", ""
+                return "Final Answer", "There is no image url. This "
             cmd = cmd[:cmd_idx + 1].lower()
             if "receipt" in cmd:
                 action = "Receipt Understanding"

AllInOneApp/langchain/langchain/agents/assistant/prompt.py

@@ -3,7 +3,7 @@ PREFIX = """Human: Hey {ai_prefix}!
 My name is Human.
 Now let me introduce you to Assistant. He is great at understanding what is going on in any image.
 Any time there is an image in our conversation that you want to know about objects description, texts, OCR (optical character recognition), people, celebrities inside of the image you could ask Assistant by addressing him. 
-Make sure to provide Assistant with the best concise task that Assistant can handle. 
+Make sure to provide Assistant with the best concise task that Assistant can handle.
 
 EXAMPLE
 {ai_prefix}: This is a business card image. Assistant, what OCR text do you see in this business card?  https://i.ibb.co/tsQ0Myn/00.jpg
@@ -101,7 +101,7 @@ prescription instructions
 
 {ai_prefix}: This image is likely a pill bottle with labels.
 {ai_prefix}: Assistant, what is the OCR texts in this image? /tmp/path/to/x_d_0(2).jpg
-Assistant: This is an image (1100 x 800) with description a bottle of medicine.
+Assistant: This is an image (1100 x 800)
 This image contains text
 
 List of texts (words) seen in this image:
@@ -111,7 +111,8 @@ SUPPLEMENT
 
 {ai_prefix}: This is medicine supplement pills by SPRING VALLEY
 Human: where can I buy this medicine? and how much is the price in Euros?
-{ai_prefix}: this question requires Bing search. Assistant, Bing search where can I buy SPRING VALLEY supplement pills? and how much is the price in Euros?
+{ai_prefix}: I do not have that information. 
+{ai_prefix}: This question requires Bing search. Assistant, Bing search where can I buy SPRING VALLEY supplement pills? and how much is the price in Euros?
 
 
 EXAMPLE
@@ -125,10 +126,14 @@ List of object tags seen in this image:
 text
 {ai_prefix}: This image is likely a receipt or ticket. Let me ask for more information about the text.
 {ai_prefix}: Assistant, what are the OCR texts in this receipt? /a/c0%5/XX99096.jpg
+
+EXAMPLE_END
 """
 SUFFIX = """
 
-Human: Previous conversation history up to NEW INPUT
+Human: Answer my question after NEW INPUT.
+Human: Answer my question after NEW INPUT. Ask Assistant when needed
+Human: Use conversation history up to NEW INPUT if needed for the answer.
 {chat_history}
 
 NEW INPUT:

AllInOneApp/langchain/langchain/chains/conversation/memory.py

@@ -117,7 +117,10 @@ class ConversationBufferMemory(Memory, BaseModel):
         new_input = inputs[prompt_input_key]
         # if new_input.startswith("http://0.0.0.0"):
         #     self.clear()
-        human = f"{self.human_prefix}: " + new_input
+        human = new_input
+        prefix = f"{self.human_prefix}: "
+        if not human.startswith(prefix):
+            human = prefix + new_input
         ai = f"{self.ai_prefix}: " + outputs[output_key]
         assistant = ""
         intermediate = outputs.get(self.output_intermediate) or []

AllInOneApp/langchain/langchain/utilities/imun.py

@@ -305,7 +305,9 @@ def create_prompt(results: Dict) -> str:
     if words:
         answer += IMUN_PROMPT_WORDS.format(words="\n".join(words))
         if languages:
-            answer += IMUN_PROMPT_LANGUAGES.format(languages="\n".join(languages))
+            langs = set(languages)
+            if len(langs) > 1 or languages[0] != "en":
+                answer += IMUN_PROMPT_LANGUAGES.format(languages="\n".join(languages))
     if faces:
         answer += IMUN_PROMPT_FACES.format(faces=_concat_objects(faces))
     if celebrities: