Merge branch 'develop' into bugfix/rollback-pydanticV2

ls1intum · Jul 3, 2024 · d27bdf8 · d27bdf8
2 parents 6780593 + dfcad8e
commit d27bdf8
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 37 deletions.
diff --git a/Caddyfile b/Caddyfile
@@ -5,5 +5,5 @@
 	redir / /playground 302
 	reverse_proxy /playground* http://playground:3000
 	reverse_proxy /logs* http://log-viewer:4998
-	reverse_proxy http://assessment-module-manager:5000
+	reverse_proxy http://assessment-module-manager:5100
 }
diff --git a/assessment_module_manager/assessment_module_manager/__main__.py b/assessment_module_manager/assessment_module_manager/__main__.py
@@ -19,10 +19,10 @@ def main():
 
     if env.PRODUCTION:
         logger.info("Running in PRODUCTION mode")
-        uvicorn.run("assessment_module_manager.__main__:app", host="0.0.0.0", port=5000)
+        uvicorn.run("assessment_module_manager.__main__:app", host="0.0.0.0", port=5100)
     else:
         logger.warning("Running in DEVELOPMENT mode")
-        uvicorn.run("assessment_module_manager.__main__:app", host="0.0.0.0", port=5000, reload=True)
+        uvicorn.run("assessment_module_manager.__main__:app", host="0.0.0.0", port=5100, reload=True)
 
 
 # Add things to __all__ just to mark them as important to import

diff --git a/athena/athena/default_values.py b/athena/athena/default_values.py
@@ -1,2 +1,2 @@
-ASSESSMENT_MODULE_MANAGER_DEFAULT_PORT = 5000
+ASSESSMENT_MODULE_MANAGER_DEFAULT_PORT = 5100
 ASSESSMENT_MODULE_MANAGER_DEFAULT_URL = f"http://localhost:{ASSESSMENT_MODULE_MANAGER_DEFAULT_PORT}"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     depends_on:
       - athena
     ports:
-      - "5000:5000"
+      - "5100:5100"
 
   module_example:
     hostname: module-example

diff --git a/docs/run/docker.rst b/docs/run/docker.rst
@@ -9,7 +9,7 @@ Build and start with local images
 
         docker-compose up --build
 
-The assessment module manager API will be available at http://localhost:5000.
+The assessment module manager API will be available at http://localhost:5100.
 
 Start with remote images
 

diff --git a/docs/run/local.rst b/docs/run/local.rst
@@ -2,7 +2,7 @@ From the Command Line
 ===========================================
 
 To run Athena, you have to start at least two processes.
-The assessment module manager API will be available at http://localhost:5000.
+The assessment module manager API will be available at http://localhost:5100.
 
 **Before you start the processes, make sure that you have loaded the environment variables from the** ``.env`` **file in each folder.** This can be achieved using
     .. code-block:: bash
@@ -22,4 +22,3 @@ Start it from the ``module_example`` (or another ``module_*`` folder) using
     .. code-block:: bash
 
         poetry run module
-
diff --git a/docs/run/pycharm.rst b/docs/run/pycharm.rst
@@ -12,4 +12,4 @@ To test a module, you need to start two run configurations:
 
 You can also start any of the run configurations in Debug Mode, to use breakpoints and step through the code.
 
-The assessment module manager API will be available at http://localhost:5000.
+The assessment module manager API will be available at http://localhost:5100.
diff --git a/module_text_llm/poetry.lock b/module_text_llm/poetry.lock
diff --git a/module_text_llm/pyproject.toml b/module_text_llm/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT"
 python = "3.11.*"
 athena = {path = "../athena", develop = true}
 openai = "^0.27.8"
-langchain = "^0.0.334"
+langchain = "^0.0.350"
 python-dotenv = "^1.0.0"
 nltk = "^3.8.1"
 gitpython = "^3.1.41"

diff --git a/playground/package-lock.json b/playground/package-lock.json
diff --git a/playground/src/hooks/base_info_context.tsx b/playground/src/hooks/base_info_context.tsx
@@ -17,7 +17,7 @@ type Action =
   | { type: 'SET_VIEW_MODE'; payload: ViewMode };
 
 function createInitialState(): BaseInfo {
-  let defaultUrl = "http://127.0.0.1:5000";
+  let defaultUrl = "http://127.0.0.1:5100";
   if (
     typeof window !== "undefined" &&
     window.location.hostname !== "localhost"

diff --git a/playground/yarn.lock b/playground/yarn.lock
@@ -1099,11 +1099,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 broadcast-channel@^3.4.1:
   version "3.7.0"
@@ -1983,10 +1983,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ To test a module, you need to start two run configurations:

		You can also start any of the run configurations in Debug Mode, to use breakpoints and step through the code.

		The assessment module manager API will be available at http://localhost:5000.
		The assessment module manager API will be available at http://localhost:5100.