cross-platform admin, updated npm depend., removed numpy & opencv

admin.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 import shutil
 import os
+from pathlib import Path
 import sys
 from cmd import Cmd
 
 stage_dir = '_playlist-manager'
-scss_rel_path = os.path.join('src', 'scss', 'style.scss')
+scss_rel_path = Path('src', 'scss', 'style.scss')
-css_rel_path = os.path.join('build', 'style.css')
+css_rel_path = Path('build', 'style.css')
 
 folders_to_ignore = ['venv', 'docs', '.git', '.idea', 'node_modules']
 
@@ -17,23 +18,23 @@ class Admin(Cmd):
 
     def prepare_stage(self):
         print('>> backing up a directory')
-        os.chdir('..')
+        os.chdir(Path(__file__).parent.parent)
 
         print('>> deleting old deployment stage')
         shutil.rmtree(stage_dir, ignore_errors=True)
 
         print('>> copying main source')
-        shutil.copytree('playlist-manager',
+        shutil.copytree('playlist-manager' if Path('playlist-manager').exists() else 'Music-Tools',
                         stage_dir,
                         ignore=lambda path, contents:
-                            contents if any(i in path.split('/') for i in folders_to_ignore) else []
+                            contents if any(i in Path(path).parts for i in folders_to_ignore) else []
                         )
 
         for dependency in ['spotframework', 'fmframework', 'spotfm']:
             print(f'>> injecting {dependency}')
             shutil.copytree(
-                os.path.join(dependency, dependency),
+                Path(dependency, dependency),
-                os.path.join(stage_dir, dependency)
+                Path(stage_dir, dependency)
             )
 
         os.chdir(stage_dir)
@@ -50,12 +51,30 @@ class Admin(Cmd):
         print('>> preparing main.py')
         shutil.copy(f'main.{path}.py', 'main.py')
 
-    def deploy_function(self, name, timeout: int = 60):
+    def deploy_function(self, name, timeout: int = 60, region='europe-west2'):
         os.system(f'gcloud functions deploy {name} '
-                  f'--runtime=python38 '
+                  f'--region {region} '
-                  f'--set-env-vars DEPLOY_DESTINATION=PROD '
+                  '--runtime=python38 '
+                  f'--trigger-topic {name} '
+                  '--set-env-vars DEPLOY_DESTINATION=PROD '
                   f'--timeout={timeout}s')
 
+    def do_all(self, args):
+        self.prepare_frontend()
+        self.prepare_stage()
+
+        self.prepare_main('api')
+        print('>> deploying api')
+        os.system('gcloud app deploy')
+
+        self.prepare_main('update_tag')
+        print('>> deploying tag function')
+        self.deploy_function('update_tag')
+
+        self.prepare_main('run_playlist')
+        print('>> deploying playlist function')
+        self.deploy_function('run_user_playlist')
+
     def do_api(self, args):
         self.prepare_frontend()
 

package.json

@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/Sarsoo/Music-Tools#readme",
   "dependencies": {
-    "@material-ui/core": "^4.10.2",
+    "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "axios": "^0.19.2",
     "chart.js": "^2.9.3",
@@ -28,10 +28,10 @@
     "react-router-dom": "^5.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.3",
+    "@babel/cli": "^7.10.5",
-    "@babel/core": "^7.10.3",
+    "@babel/core": "^7.10.5",
-    "@babel/preset-env": "^7.10.3",
+    "@babel/preset-env": "^7.10.4",
-    "@babel/preset-react": "^7.10.1",
+    "@babel/preset-react": "^7.10.4",
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^3.6.0",

requirements.txt

@@ -23,8 +23,6 @@ Jinja2==2.11.2
 lazy-object-proxy==1.4.3
 MarkupSafe==1.1.1
 mccabe==0.6.1
-numpy==1.19.0
-opencv-python==4.2.0.34
 pathtools==0.1.2
 protobuf==3.12.2
 pyasn1==0.4.8