Force galvani and navani update in lockfile (#602)

* Force galvani and navani update in lockfile; important to generate with older Python

* Dial down default `WEB_CONCURRENCY`

* Also skip LFS smudge in CI

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.docker/server_dockerfile

@@ -2,6 +2,9 @@
 FROM python:3.10 as base
 SHELL ["/bin/bash", "--login", "-c"]
 
+# Useful for installing deps from git, preventing big downloads and bandwith quotas
+ENV GIT_LFS_SKIP_SMUDGE=1
+
 # Install system dependencies
 RUN apt update && apt install -y gnupg curl tree mdbtools && apt clean
 
@@ -32,7 +35,7 @@ RUN [ "pipenv", "run", "pip", "install", "gunicorn" ]
 COPY ./pydatalab/ ./
 
 # This will define the number of gunicorn workers
-ARG WEB_CONCURRENCY=16
+ARG WEB_CONCURRENCY=4
 ENV WEB_CONCURRENCY=${WEB_CONCURRENCY}
 
 ARG PORT=5001

.github/workflows/ci.yml

@@ -8,6 +8,9 @@ on:
 
 env:
   FORCE_COLOR: true
+  # Need to set this to avoid pipenv syncing an entire LFS repo and failing with bandwidth quota (see
+  # https://github.com/the-grey-group/datalab/issues/603)
+  GIT_LFS_SKIP_SMUDGE: 1
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}

.github/workflows/ci_release.yml

@@ -9,6 +9,9 @@ env:
   PUBLISH_UPDATE_BRANCH: main
   GIT_USER_NAME: "Greymon (bot)"
   GIT_USER_EMAIL: "[email protected]"
+  # Need to set this to avoid pipenv syncing an entire LFS repo and failing with bandwidth quota (see
+  # https://github.com/the-grey-group/datalab/issues/603)
+  GIT_LFS_SKIP_SMUDGE: 1
 
 jobs:
   publish:

docker-compose.yml

@@ -35,7 +35,7 @@ services:
       dockerfile: .docker/server_dockerfile
       target: production
       args:
-        - WEB_CONCURRENCY=16
+        - WEB_CONCURRENCY=4
     depends_on:
       - database
     volumes:

pydatalab/Pipfile

@@ -16,7 +16,6 @@ pandas = "*"
 scipy = "*"
 matplotlib = "*"
 pymongo = "*"
-galvani = "*"
 openpyxl = "*"
 nmrglue = "*"
 python-dotenv = "*"
@@ -28,7 +27,8 @@ flask-compress = "*"
 pillow = "*"
 openai = "~= 0.28"
 tiktoken = "*"
-navani = {git = "git+https://github.com/the-grey-group/[email protected]"}
+galvani = {git = "git+https://github.com/echemdata/galvani.git@1fd9f84"}
+navani = {git = "git+https://github.com/the-grey-group/[email protected]"}
 python-dateutil = "*"
 pybaselines = "*"
 rosettasciio = "*"