EVI-EnLitePy Endpoint for EV Charging Profiles

.gitignore

@@ -122,3 +122,4 @@ julia_src/licenseserver
 julia_src/Dockerfile.xpress
 docker-compose.xpress.yml
 julia_src/solver_setup.sh
+compare_run_*.json

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "EVI-EnLitePy"]
+	path = EVI-EnLitePy
+	url = https://github.nrel.gov/AVCI/EVI-EnLitePy.git
+    branch = server_version

.helm/templates/julia-deployment.yaml

@@ -53,7 +53,7 @@ spec:
           resources:
             requests:
               cpu: {{ .Values.juliaCpuRequest | quote }}
-              memory: {{ .Values.juliaMemoryRequest | quote }}
+              memory: "2000Mi"
             limits:
               cpu: {{ .Values.juliaCpuLimit | quote }}
-              memory: {{ .Values.juliaMemoryLimit | quote }}
+              memory: "2000Mi"

.helm/values.production.yaml

@@ -1,11 +1,11 @@
 appEnv: production
 djangoSettingsModule: reopt_api.production_settings
 djangoReplicas: 10
+djangoCpuRequest: "1000m"
+djangoCpuLimit: "2000m"
 djangoMemoryRequest: "2000Mi"
 djangoMemoryLimit: "2000Mi"
 celeryReplicas: 10
-celeryMemoryRequest: "900Mi"
-celeryMemoryLimit: "900Mi"
 juliaReplicas: 5
 juliaCpuRequest: "2000m"
 juliaCpuLimit: "4000m"

.helm/values.staging.yaml

@@ -1,4 +1,2 @@
 appEnv: staging
-djangoSettingsModule: reopt_api.staging_settings
-juliaMemoryRequest: "8000Mi"
-juliaMemoryLimit: "8000Mi"
+djangoSettingsModule: reopt_api.staging_settings

.helm/values.yaml

@@ -8,18 +8,18 @@ redisDataVolumeStorageClassName:
 juliaHost: "{{ .Chart.Name }}-julia-service"
 redisHost: "{{ .Chart.Name }}-redis-service"
 redisPort: 6379
-djangoReplicas: 2
-djangoCpuRequest: "2000m"
-djangoCpuLimit: "4000m"
-djangoMemoryRequest: "1600Mi"
-djangoMemoryLimit: "1600Mi"
-celeryReplicas: 2
+djangoReplicas: 1
+djangoCpuRequest: "500m"
+djangoCpuLimit: "2000m"
+djangoMemoryRequest: "700Mi"
+djangoMemoryLimit: "700Mi"
+celeryReplicas: 1
 celeryCpuRequest: "100m"
-celeryCpuLimit: "2000m"
-celeryMemoryRequest: "700Mi"
-celeryMemoryLimit: "700Mi"
+celeryCpuLimit: "1000m"
+celeryMemoryRequest: "1600Mi"
+celeryMemoryLimit: "1600Mi"
 juliaReplicas: 1
-juliaCpuRequest: "1000m"
+juliaCpuRequest: "500m"
 juliaCpuLimit: "2000m"
-juliaMemoryRequest: "8000Mi"
-juliaMemoryLimit: "8000Mi"
+juliaMemoryRequest: "6000Mi"
+juliaMemoryLimit: "6000Mi"

Dockerfile

@@ -1,4 +1,4 @@
-FROM reopt/py38
+FROM reopt/py312
 
 # Install NREL root certs for machines running on NREL's network.
 ARG NREL_ROOT_CERT_URL_ROOT=""
@@ -9,12 +9,18 @@ ENV SRC_DIR=/opt/reopt/reo/src
 ENV LD_LIBRARY_PATH="/opt/reopt/reo/src:${LD_LIBRARY_PATH}"
 
 # Copy all code
-ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONDONTWRITEBYTECODE=1
 COPY . /opt/reopt
 
 # Install python packages
 WORKDIR /opt/reopt
 RUN ["pip", "install", "-r", "requirements.txt"]
 
+# Conditionally install EVI-EnLitePy and pydantic (dependency) if EVI-EnLitePy has been cloned via git submodule
+RUN if [ -d "/opt/reopt/EVI-EnLitePy" ] && [ "$(ls -A /opt/reopt/EVI-EnLitePy)" ]; then \
+    cd /opt/reopt/EVI-EnLitePy && pip install -e .; \
+    pip install pydantic; \
+fi
+
 EXPOSE 8000
 ENTRYPOINT ["/bin/bash", "-c"]

load_builder/urls.py

@@ -5,4 +5,5 @@
 
 urlpatterns = [
     re_path(r'^load_builder/?$', views.load_builder),
+    re_path(r'^ensite/?$', views.ensite_view),
 ]