fix merge conflict errors

.github/workflows/backend.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       #----------------------------------------------
       #       check-out repo and set-up mamba env
@@ -49,7 +49,7 @@ jobs:
         id: cached-poetry-dependencies
         uses: actions/cache@v3
         with:
-          path: /usr/share/miniconda3/envs/dlp
+          path: /home/runner/micromamba/envs/dlp/
           key: training-venv-${{ runner.os }}-${{ hashFiles('**/training/poetry.lock') }}
           restore-keys: training-venv-${{ runner.os }}-
 
@@ -60,11 +60,8 @@ jobs:
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
         run: pwd && cd training && poetry install --no-interaction --no-root && poetry env info -p
-        shell: bash -el {0}
+        shell: micromamba-shell {0}
 
-      - name: Add Poetry env to PATH
-        run: cd training && echo "$(poetry env info --path)/bin" >> $GITHUB_PATH
-        shell: bash -el {0}
       #----------------------------------------------
       #       pyright static checker
       #----------------------------------------------
@@ -131,7 +128,7 @@ jobs:
         id: cached-poetry-dependencies
         uses: actions/cache@v3
         with:
-          path: /usr/share/miniconda3/envs/dlp
+          path: /home/runner/micromamba/envs/dlp/
           key: training-venv-${{ runner.os }}-${{ hashFiles('**/training/poetry.lock') }}
           restore-keys: training-venv-${{ runner.os }}-
 
@@ -141,11 +138,7 @@ jobs:
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
         run: cd training && poetry install --no-interaction --no-root
-        shell: bash -el {0}
-
-      - name: Add Poetry env to PATH
-        run: cd training && echo "$(poetry env info --path)/bin" >> $GITHUB_PATH
-        shell: bash -el {0}
+        shell: micromamba-shell {0}
       #----------------------------------------------
       #       run test suite
       #----------------------------------------------

backend/tests/test_model.py

@@ -1,5 +1,6 @@
 import pytest
 import torch.nn as nn
+from torch.autograd import Variable
 from dl.dl_model import *
 
 
@@ -12,7 +13,19 @@
     ],
 )
 def test_dlmodel(input_list):
+    print("input_list: " + str(input_list) + " is of type " + str(type(input_list)))
     my_model = DLModel(input_list)
+    print("my_model: " + str(my_model) + " is of type " + str(type(my_model)))
+    print(
+        "[module for module in my_model.model.modules() if not isinstance(module, nn.Sequential)]: "
+        + str(
+            [
+                module
+                for module in my_model.model.modules()
+                if not isinstance(module, nn.Sequential)
+            ]
+        )
+    )
     assert [
         module
         for module in my_model.model.modules()

backend/tests/test_model_parser.py

@@ -1,5 +1,6 @@
 import pytest
 import torch.nn as nn
+from torch.autograd import Variable
 from dl.dl_model_parser import *
 
 # come up with the expected parsing
@@ -26,4 +27,9 @@
     ],
 )
 def test_parse_user_architecture(user_model, expected):
+    print(
+        "parse_user_architecture(user_model): "
+        + str(parse_deep_user_architecture(user_model))
+    )
+    print("expected: " + str(expected))
     assert [i == j for i, j in zip(parse_deep_user_architecture(user_model), expected)]

serverless/yarn.lock

@@ -1610,11 +1610,6 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
   integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
-"@fastify/busboy@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
-  integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
-
 "@graphql-tools/executor@^0.0.18":
   version "0.0.18"
   resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-0.0.18.tgz#5b9f881d59484ea55278de3b4743ece8d68bc6e7"
@@ -4531,9 +4526,9 @@ pkg-up@^3.1.0:
     find-up "^3.0.0"
 
 postcss@^8.4.27:
-  version "8.4.31"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
-  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
+  version "8.4.28"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.28.tgz#c6cc681ed00109072816e1557f889ef51cf950a5"
+  integrity sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"
@@ -5195,11 +5190,11 @@ ultron@~1.1.0:
   integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 undici@^5.12.0:
-  version "5.26.3"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.26.3.tgz#ab3527b3d5bb25b12f898dfd22165d472dd71b79"
-  integrity sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.23.0.tgz#e7bdb0ed42cebe7b7aca87ced53e6eaafb8f8ca0"
+  integrity sha512-1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg==
   dependencies:
-    "@fastify/busboy" "^2.0.0"
+    busboy "^1.6.0"
 
 universalify@^2.0.0:
   version "2.0.0"
@@ -5542,6 +5537,6 @@ zip-stream@^4.1.0:
     readable-stream "^3.6.0"
 
 zod@^3.21.4:
-  version "3.22.3"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.3.tgz#2fbc96118b174290d94e8896371c95629e87a060"
-  integrity sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==
+  version "3.22.1"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.1.tgz#815f850baf933fef96c1061322dbe579b1a80c27"
+  integrity sha512-+qUhAMl414+Elh+fRNtpU+byrwjDFOS1N7NioLY+tSlcADTx4TkCUua/hxJvxwDXcV4397/nZ420jy4n4+3WUg==