Merge branch 'development' into development

environment-mac.yaml

@@ -41,6 +41,7 @@ dependencies:
   - torchmetrics==0.9.3
   - pip:
     - opencv-python==4.6.0
+    - protobuf==3.20.1
     - realesrgan==0.2.5.0
     - test-tube==0.7.5
     - transformers==4.21.2

ldm/dream/server.py

@@ -249,6 +249,15 @@ class DreamServer(BaseHTTPRequestHandler):
         except CanceledException:
             print(f"Canceled.")
             return
+        except Exception as e:
+            print("Error happened")
+            print(e)
+            self.wfile.write(bytes(json.dumps(
+                {'event': 'error',
+                 'message': str(e),
+                 'type': e.__class__.__name__}
+            ) + '\n',"utf-8"))
+            raise e
 
 
 class ThreadingDreamServer(ThreadingHTTPServer):

requirements-mac-MPS-CPU.txt

@@ -3,6 +3,7 @@
 --pre
 --extra-index-url https://download.pytorch.org/whl/nightly/cpu --trusted-host https://download.pytorch.org
 
+protobuf==3.19.4
 torch
 torchvision
 -e .