Merge pull request #112 from marieai/develop

Develop

.gitignore

@@ -211,3 +211,5 @@ playbook/*.retry
 /ansible/inventories/hosts.prod.yml
 ansible/inventories/hosts.dev.yml
 /examples/config.prod.json
+
+.gradle

.pre-commit-config.yaml

@@ -37,7 +37,8 @@ repos:
   #       args:
   #       - --select=D101,D102,D103
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+#    rev: 22.3.0
+    rev: 24.3.0
     hooks:
     - id: black
       types: [python]

.run/marie server - matcher.run.xml

@@ -0,0 +1,31 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="marie server - matcher" type="PythonConfigurationType" factoryName="Python">
+    <module name="marie-ai" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="COLUMNS" value="120" />
+      <env name="CUDA_VISIBLE_DEVICES" value="0" />
+      <env name="MARIE_CACHE_LOCK_TIMEOUT" value="10" />
+      <env name="MARIE_DEBUG" value="0" />
+      <env name="MARIE_DEBUG_PORT" value="5678" />
+      <env name="MARIE_DEFAULT_MOUNT" value="/mnt/data/marie-ai" />
+      <env name="XXXXJINA_MP_START_METHOD" value="fork" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="false" />
+    <option name="ADD_SOURCE_ROOTS" value="false" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/marie/__main__.py" />
+    <option name="PARAMETERS" value="server --start --uses /mnt/data/marie-ai/config/service/marie-template-matching.yml" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/template-matching app .run.xml

@@ -14,7 +14,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="streamlit" />
-    <option name="PARAMETERS" value="run app.py --server.enableXsrfProtection=false" />
+    <option name="PARAMETERS" value="run app.py --server.enableXsrfProtection=false --server.fileWatcherType none" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="true" />