Merge pull request #155 from NimbleBoxAI/fury

v2 Koval
NimbleBoxAI · Oct 13, 2023 · 2a8cc5d · 2a8cc5d
2 parents 044e1c6 + c40496c
commit 2a8cc5d
Show file tree

Hide file tree

Showing 118 changed files with 5,036 additions and 3,130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -150,3 +150,4 @@ api_docs/_build/
 api_docs/_static/
 cf
 locust_file.py
+demo/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "cf_internal"]
+	path = cf_internal
+	url = https://github.com/NimbleBoxAI/cf_internal.git
diff --git a/Dockerfile b/Dockerfile
@@ -26,7 +26,6 @@ COPY ./server/pyproject.toml /app
 COPY ./server/README.md /app
 WORKDIR /app
 RUN python3 -m pip install PyMySQL
-RUN python3 -m pip install langflow==0.0.54
 RUN python3 -m pip install -e .
 WORKDIR /
 

diff --git a/Dockerfile.private b/Dockerfile.private
@@ -0,0 +1,45 @@
+# first stage is to build the client
+FROM node:16-alpine3.14 as builder
+WORKDIR /app
+COPY ./client/package*.json ./client/yarn.lock ./
+RUN yarn install --frozen-lockfile
+COPY ./client .
+RUN yarn build
+ENV NODE_ENV production
+
+# then we copy over the server
+FROM python:3.9
+RUN mkdir /app
+
+# this is copying over the chainfury engine and install it
+COPY ./chainfury /app/chainfury
+COPY pyproject.toml /app
+COPY README.md /app
+WORKDIR /app
+RUN python3 -m pip install .\[all\]
+WORKDIR /
+
+# this is copying over the chainfury-internal and installing it
+COPY ./cf_internal /app/cf_internal
+WORKDIR /app
+RUN python3 -m pip install ./cf_internal
+WORKDIR /
+
+# copy over the server files including the server installer, since chainfury is already installed
+# it would use the cached version and not try to install it again from pypi
+COPY ./server/chainfury_server /app/chainfury_server
+COPY ./server/pyproject.toml /app
+COPY ./server/README.md /app
+WORKDIR /app
+RUN python3 -m pip install PyMySQL
+RUN python3 -m pip install -e .
+WORKDIR /
+
+# Copy over the files from the client build
+RUN rm -rf /app/static
+RUN rm -rf /app/templates
+COPY --from=builder /app/dist/. /app/chainfury_server/static/.
+
+WORKDIR /app/chainfury_server
+EXPOSE 8000
+CMD ["python3", "server.py", "--host", "0.0.0.0", "--port", "8000", "--pre", "['cf_internal']"]
diff --git a/api_docs/cf_server/chainfury_server.api.auth.rst b/api_docs/cf_server/chainfury_server.api.auth.rst
diff --git a/api_docs/cf_server/chainfury_server.api.chains.rst b/api_docs/cf_server/chainfury_server.api.chains.rst
@@ -0,0 +1,7 @@
+chainfury\_server.api.chains module
+===================================
+
+.. automodule:: chainfury_server.api.chains
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/api_docs/cf_server/chainfury_server.api.chatbot.rst b/api_docs/cf_server/chainfury_server.api.chatbot.rst
diff --git a/api_docs/cf_server/chainfury_server.api.dashboard.rst b/api_docs/cf_server/chainfury_server.api.dashboard.rst
diff --git a/api_docs/cf_server/chainfury_server.api.feedback.rst b/api_docs/cf_server/chainfury_server.api.feedback.rst
diff --git a/api_docs/cf_server/chainfury_server.api.fury.rst b/api_docs/cf_server/chainfury_server.api.fury.rst
@@ -1,5 +1,5 @@
-fury module
-===========
+chainfury\_server.api.fury module
+=================================
 
 .. automodule:: chainfury_server.api.fury
    :members:

diff --git a/api_docs/cf_server/chainfury_server.api.intermediate_steps.rst b/api_docs/cf_server/chainfury_server.api.intermediate_steps.rst
diff --git a/api_docs/cf_server/chainfury_server.api.langflow.rst b/api_docs/cf_server/chainfury_server.api.langflow.rst
diff --git a/api_docs/cf_server/chainfury_server.api.metrics.rst b/api_docs/cf_server/chainfury_server.api.metrics.rst
diff --git a/api_docs/cf_server/chainfury_server.api.prompts.rst b/api_docs/cf_server/chainfury_server.api.prompts.rst
@@ -1,5 +1,5 @@
-prompts module
-==============
+chainfury\_server.api.prompts module
+====================================
 
 .. automodule:: chainfury_server.api.prompts
    :members:

diff --git a/api_docs/cf_server/chainfury_server.api.rst b/api_docs/cf_server/chainfury_server.api.rst
@@ -6,17 +6,13 @@ chainfury\_server.api package
    :undoc-members:
    :show-inheritance:
 
+Submodules
+----------
+
 .. toctree::
    :maxdepth: 4
 
-   chainfury_server.api.auth
-   chainfury_server.api.chatbot
-   chainfury_server.api.dashboard
-   chainfury_server.api.feedback
+   chainfury_server.api.chains
    chainfury_server.api.fury
-   chainfury_server.api.intermediate_steps
-   chainfury_server.api.langflow
-   chainfury_server.api.metrics
    chainfury_server.api.prompts
-   chainfury_server.api.template
    chainfury_server.api.user
diff --git a/api_docs/cf_server/chainfury_server.api.template.rst b/api_docs/cf_server/chainfury_server.api.template.rst
diff --git a/api_docs/cf_server/chainfury_server.api.user.rst b/api_docs/cf_server/chainfury_server.api.user.rst
@@ -1,5 +1,5 @@
-user module
-===========
+chainfury\_server.api.user module
+=================================
 
 .. automodule:: chainfury_server.api.user
    :members:

diff --git a/api_docs/cf_server/chainfury_server.commons.config.rst b/api_docs/cf_server/chainfury_server.commons.config.rst
diff --git a/api_docs/cf_server/chainfury_server.commons.constants.rst b/api_docs/cf_server/chainfury_server.commons.constants.rst
diff --git a/api_docs/cf_server/chainfury_server.commons.gpt_rating.rst b/api_docs/cf_server/chainfury_server.commons.gpt_rating.rst
diff --git a/api_docs/cf_server/chainfury_server.commons.metrics_utils.rst b/api_docs/cf_server/chainfury_server.commons.metrics_utils.rst
diff --git a/api_docs/cf_server/chainfury_server.commons.rst b/api_docs/cf_server/chainfury_server.commons.rst
diff --git a/api_docs/cf_server/chainfury_server.commons.types.rst b/api_docs/cf_server/chainfury_server.commons.types.rst
diff --git a/api_docs/cf_server/chainfury_server.commons.utils.rst b/api_docs/cf_server/chainfury_server.commons.utils.rst
diff --git a/api_docs/cf_server/chainfury_server.database_constants.rst b/api_docs/cf_server/chainfury_server.database_constants.rst
diff --git a/api_docs/cf_server/chainfury_server.database_utils.chatbot.rst b/api_docs/cf_server/chainfury_server.database_utils.chatbot.rst
diff --git a/api_docs/cf_server/chainfury_server.database_utils.dashboard.rst b/api_docs/cf_server/chainfury_server.database_utils.dashboard.rst
diff --git a/api_docs/cf_server/chainfury_server.database_utils.general_utils.rst b/api_docs/cf_server/chainfury_server.database_utils.general_utils.rst
diff --git a/api_docs/cf_server/chainfury_server.database_utils.intermediate_step.rst b/api_docs/cf_server/chainfury_server.database_utils.intermediate_step.rst
diff --git a/api_docs/cf_server/chainfury_server.database_utils.prompt.rst b/api_docs/cf_server/chainfury_server.database_utils.prompt.rst
diff --git a/api_docs/cf_server/chainfury_server.database_utils.rst b/api_docs/cf_server/chainfury_server.database_utils.rst
diff --git a/api_docs/cf_server/chainfury_server.engines.langflow.rst b/api_docs/cf_server/chainfury_server.engines.langflow.rst
diff --git a/api_docs/cf_server/chainfury_server.engines.rst b/api_docs/cf_server/chainfury_server.engines.rst
@@ -6,10 +6,11 @@ chainfury\_server.engines package
    :undoc-members:
    :show-inheritance:
 
+Submodules
+----------
+
 .. toctree::
    :maxdepth: 4
 
    chainfury_server.engines.fury
-   chainfury_server.engines.langflow
    chainfury_server.engines.registry
-
diff --git a/api_docs/cf_server/chainfury_server.plugins.base.rst b/api_docs/cf_server/chainfury_server.plugins.base.rst
diff --git a/api_docs/cf_server/chainfury_server.plugins.echo.rst b/api_docs/cf_server/chainfury_server.plugins.echo.rst
diff --git a/api_docs/cf_server/chainfury_server.plugins.handler.rst b/api_docs/cf_server/chainfury_server.plugins.handler.rst
diff --git a/api_docs/cf_server/chainfury_server.plugins.loader.rst b/api_docs/cf_server/chainfury_server.plugins.loader.rst
diff --git a/api_docs/cf_server/chainfury_server.plugins.rst b/api_docs/cf_server/chainfury_server.plugins.rst
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,3 +150,4 @@ api_docs/_build/ @@
     api_docs/_static/
     cf
     locust_file.py
+    demo/