From 732f524372d9d98043fba385ec91f4dfddc7d2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Mon, 24 Apr 2023 12:09:36 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=92=BD=20fix:=20encoding=20issue=20on?= =?UTF-8?q?=20windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 3 ++- src/options/generate/templates_user.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index b8c59f4..079a8d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,9 @@ +jina==3.15.1.dev14 +protobuf<3.21.0 click streamlit openai psutil -jina jcloud jina-hubble-sdk langchain \ No newline at end of file diff --git a/src/options/generate/templates_user.py b/src/options/generate/templates_user.py index 001648d..d7c6a06 100644 --- a/src/options/generate/templates_user.py +++ b/src/options/generate/templates_user.py @@ -167,7 +167,7 @@ template_generate_requirements = PromptTemplate.from_template( Write the content of the requirements.txt file. Make sure to include pytest. Make sure to include openai>=0.26.0. -Make sure that jina==3.14.1. +Make sure that jina==3.15.1.dev14. Make sure that docarray==0.21.0. You must not add gpt_3_5_turbo_api to the requirements.txt file. @@ -187,7 +187,7 @@ Usually libraries are installed with apt-get. Be aware that the machine the docker container is running on does not have a GPU - only CPU. Add the config.yml file to the Dockerfile. Note that the Dockerfile only has access to the files: microservice.py, requirements.txt, config.yml and test_microservice.py. -The base image of the Dockerfile is FROM jinaai/jina:3.14.1-py39-standard. +The base image of the Dockerfile is FROM jinaai/jina:3.15.1-dev14-py39-standard. The entrypoint is ENTRYPOINT ["jina", "executor", "--uses", "config.yml"]. Make sure the all files are in the /workdir. The Dockerfile runs the test during the build process. From 446016d0cfcd991cf9dcddbebd8651f2f5d34eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Mon, 24 Apr 2023 13:36:42 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=92=BD=20fix:=20encoding=20issue=20on?= =?UTF-8?q?=20windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/jina_cloud.py | 2 +- src/options/generate/static_files/gateway/Dockerfile | 2 +- src/options/generate/static_files/gateway/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apis/jina_cloud.py b/src/apis/jina_cloud.py index 3efa3e6..5f8543d 100644 --- a/src/apis/jina_cloud.py +++ b/src/apis/jina_cloud.py @@ -229,7 +229,7 @@ with: port: 8080 protocol: http jcloud: - version: 3.14.2.dev18 + version: 3.15.1.dev14 labels: creator: microchain name: gptdeploy diff --git a/src/options/generate/static_files/gateway/Dockerfile b/src/options/generate/static_files/gateway/Dockerfile index acc112d..660b5d7 100644 --- a/src/options/generate/static_files/gateway/Dockerfile +++ b/src/options/generate/static_files/gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM jinaai/jina:3.14.1-py310-standard +FROM jinaai/jina:3.15.1-dev14-py39-standard RUN apt-get update && apt-get install --no-install-recommends -y git pip nginx && rm -rf /var/lib/apt/lists/* diff --git a/src/options/generate/static_files/gateway/requirements.txt b/src/options/generate/static_files/gateway/requirements.txt index 1b77a87..91d328c 100644 --- a/src/options/generate/static_files/gateway/requirements.txt +++ b/src/options/generate/static_files/gateway/requirements.txt @@ -1,3 +1,3 @@ streamlit==1.16.0 extra-streamlit-components==0.1.55 -jina==3.14.1 \ No newline at end of file +jina==3.15.1.dev14 \ No newline at end of file From 76f6147ae3fb34d561be8a892e47803d36780e29 Mon Sep 17 00:00:00 2001 From: "ROCKSTAR\\hoenicke" Date: Mon, 24 Apr 2023 18:43:32 +0200 Subject: [PATCH 3/4] fix: encoding --- requirements.txt | 3 +-- src/env.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 079a8d0..9a935b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ jina==3.15.1.dev14 -protobuf<3.21.0 click -streamlit +streamlit==1.9.0 openai psutil jcloud diff --git a/src/env.py b/src/env.py index 852ae97..3fe53a6 100644 --- a/src/env.py +++ b/src/env.py @@ -1,4 +1,5 @@ import os os.environ['PYTHONIOENCODING'] = 'utf-8' -os.environ['PYTHONLEGACYWINDOWSSTDIO'] = 'utf-8' \ No newline at end of file +os.environ['PYTHONLEGACYWINDOWSSTDIO'] = 'utf-8' +os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'python' # because protobuf issues on windows \ No newline at end of file From 7156bbcbcea76e7c331f3742e9d0b5cf93f96570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Ho=CC=88nicke?= Date: Mon, 24 Apr 2023 19:07:52 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=92=BD=20fix:=20encoding=20issue=20on?= =?UTF-8?q?=20windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9a935b1..65abdd2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ jina==3.15.1.dev14 click streamlit==1.9.0 -openai +openai>=0.26.0 psutil jcloud jina-hubble-sdk