DVC clean up (#1180)

.dockerignore

@@ -1,4 +1,3 @@
-.dvc
 .pnpm-store
 assets
 coverage

.github/workflows/docs.yml

@@ -47,11 +47,6 @@ jobs:
       #   with:
       #     detached: true
 
-      # - name: 'Setup DVC & Pull Models'
-      #   uses: ./.github/actions/setup-dvc
-      #   with:
-      #     gdrive_credentials_data: ${{ secrets.GDRIVE_CREDENTIALS_DATA }}          
-
       - name: 'Setup PNPM'
         uses: ./.github/actions/setup-pnpm
 

.github/workflows/tests.yml

@@ -14,10 +14,10 @@ jobs:
         with:
           lfs: 'true'
 
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        with:
-          detached: true
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      #   with:
+      #     detached: true
 
       - name: 'Setup PNPM with Node 16'
         uses: ./.github/actions/setup-pnpm
@@ -153,11 +153,6 @@ jobs:
         with:
           node-version: 16
 
-      # - name: 'Setup DVC & Pull Models'
-      #   uses: ./.github/actions/setup-dvc
-      #   with:
-      #     gdrive_credentials_data: ${{ secrets.GDRIVE_CREDENTIALS_DATA }}          
-
       - name: 'Build Models'
         run: pnpm test:integration:browserstack -- --ci --verbose --skipTest --skipUpscalerBuild --skipBundle
 
@@ -208,11 +203,6 @@ jobs:
         with:
           node-version: 16
 
-      # - name: 'Setup DVC & Pull Models'
-      #   uses: ./.github/actions/setup-dvc
-      #   with:
-      #     gdrive_credentials_data: ${{ secrets.GDRIVE_CREDENTIALS_DATA }}          
-
       - name: 'Build Models'
         run: pnpm test:integration:node -- --ci --verbose --skipTest --skipUpscalerBuild --skipBundle
 
@@ -239,11 +229,6 @@ jobs:
         with:
           node-version: 16
 
-      # - name: 'Setup DVC & Pull Models'
-      #   uses: ./.github/actions/setup-dvc
-      #   with:
-      #     gdrive_credentials_data: ${{ secrets.GDRIVE_CREDENTIALS_DATA }}          
-
       # - name: Setup tmate session
       #   uses: mxschmitt/action-tmate@v3
       #   with:
@@ -272,11 +257,6 @@ jobs:
         with:
           node-version: 16
 
-      # - name: 'Setup DVC & Pull Models'
-      #   uses: ./.github/actions/setup-dvc
-      #   with:
-      #     gdrive_credentials_data: ${{ secrets.GDRIVE_CREDENTIALS_DATA }}          
-
       - name: 'Build Models'
         run: pnpm test:model -- --ci --verbose --skipTest --skipUpscalerBuild --skipBundle
 
@@ -300,11 +280,6 @@ jobs:
         with:
           node-version: 16
 
-      # - name: 'Setup DVC & Pull Models'
-      #   uses: ./.github/actions/setup-dvc
-      #   with:
-      #     gdrive_credentials_data: ${{ secrets.GDRIVE_CREDENTIALS_DATA }}          
-
       - name: 'Build Models'
         run: pnpm test:memory-leaks -- --ci --verbose --skipTest --skipUpscalerBuild --skipBundle
 
@@ -333,11 +308,6 @@ jobs:
       #   with:
       #     detached: true
 
-      # - name: 'Setup DVC & Pull Models'
-      #   uses: ./.github/actions/setup-dvc
-      #   with:
-      #     gdrive_credentials_data: ${{ secrets.GDRIVE_CREDENTIALS_DATA }}          
-
       - name: 'Install dependencies'
         run: pnpm install
 

internals/upscaler-cli/src/lib/package-scripts/build-model.ts

@@ -215,7 +215,7 @@ const buildModel = async (
     const modelsFolder = path.resolve(MODELS_DIR, model, 'models');
     const modelFiles = fs.readdirSync(modelsFolder);
     if (modelFiles.length === 0) {
-      throw new Error(`No model files found in folder ${modelsFolder}. Did you call dvc pull for ${model}?`);
+      throw new Error(`No model files found in folder ${modelsFolder}. Did you call or set up git lfs for ${model}?`);
     }
   }
   if (opts.verbose) {

models/default-model/.npmignore

@@ -5,4 +5,4 @@ node_modules
 test
 demo
 DOC.mdx
-models.dvc
+.gitattributes

models/esrgan-legacy/.npmignore

@@ -5,4 +5,4 @@ node_modules
 test
 demo
 DOC.mdx
-models.dvc
+.gitattributes

models/esrgan-medium/.npmignore

@@ -5,5 +5,5 @@ node_modules
 test
 demo
 DOC.mdx
-models.dvc
 doc-snippets
+.gitattributes

models/esrgan-slim/.npmignore

@@ -5,5 +5,5 @@ node_modules
 test
 demo
 DOC.mdx
-models.dvc
 doc-snippets
+.gitattributes

models/esrgan-thick/.npmignore

@@ -5,4 +5,5 @@ node_modules
 test
 demo
 DOC.mdx
-models.dvc
+doc-snippets
+.gitattributes

models/pixel-upsampler/.npmignore

@@ -5,4 +5,5 @@ node_modules
 test
 demo
 DOC.mdx
-models.dvc
+doc-snippets
+.gitattributes

netlify.toml

@@ -2,8 +2,7 @@
 #   NPM_FLAGS = "--version"
 # [build]
 #   base = "docs/"
-#   # command = "pip install --upgrade pip && pip install dvc[all] && echo '>>>>>>>>' && GDRIVE_CREDENTIALS_DATA=$GDRIVE_CREDENTIALS_DATA dvc pull -v -r gdrive-service-account && npx pnpm i --store=node_modules/.pnpm-store && npx pnpm run build"
-#   command = "pip install --upgrade pip && pip install dvc[all] && echo '>>>>>>>>' && GDRIVE_CREDENTIALS_DATA=$GDRIVE_CREDENTIALS_DATA dvc pull -v -r gdrive-service-account && pnpm i --store=node_modules/.pnpm-store && pnpm run build"
+#   command = "pip install --upgrade pip && echo '>>>>>>>>' && pnpm i --store=node_modules/.pnpm-store && pnpm run build"
 #   # command = "npx pnpm i --store=node_modules/.pnpm-store && npx pnpm run build"
 #   # publish = "build"
 #   # ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ."

scripts/package-scripts/build-model.ts

@@ -216,7 +216,7 @@ const buildModel = async (
     const modelsFolder = path.resolve(MODELS_DIR, model, 'models');
     const modelFiles = fs.readdirSync(modelsFolder);
     if (modelFiles.length === 0) {
-      throw new Error(`No model files found in folder ${modelsFolder}. Did you call dvc pull for ${model}?`);
+      throw new Error(`No model files found in folder ${modelsFolder}. Did you enable Git LFS for ${model}?`);
     }
   }
   if (opts.verbose) {

scripts/package-scripts/create-new-model-folder.ts

@@ -78,7 +78,6 @@ const createNpmIgnore = (): string => [
   'test',
   'demo',
   'DOC.mdx',
-  'models.dvc',
 ].join('\n');
 
 const createGitIgnore = () => [

test/lib/node/prepare.ts

@@ -58,7 +58,7 @@ export const prepareScriptBundleForNodeCJS: Bundle<BundleOpts> = async ({
         const modelsFolder = path.resolve(MODELS_DIR, packageName, 'models');
         const modelFiles = fs.readdirSync(modelsFolder);
         if (modelFiles.length === 0) {
-          throw new Error(`No model files found in folder ${modelsFolder}. Did you call dvc pull for ${packageName}?`);
+          throw new Error(`No model files found in folder ${modelsFolder}. Did you enable Git LFS for ${packageName}?`);
         }
         return {
           src: path.resolve(MODELS_DIR, packageName),