comment GenericMeta

docker-compose/nginx.conf

@@ -12,14 +12,6 @@ http {
   # this is necessary for us to be able to disable request buffering in all cases
   proxy_http_version 1.1;
 
- # upstream semaphore {
- #   server semaphore:3000;
- # }
- 
-#  upstream manager {
-#    server manager:8080;
-#  } 
-
   server {
   	listen [::]:80 default_server;
   	server_name _;
@@ -61,40 +53,33 @@ http {
       proxy_request_buffering off;
     }
     
-#    location /api/ws {
-#      proxy_pass http://semaphore:3000/api/ws;
-#      proxy_http_version 1.1;
-#      proxy_set_header Upgrade $http_upgrade;
-#      proxy_set_header Connection "upgrade";
-#      proxy_set_header Origin "";
-#    }
-    
-#    location /manger {
-#      proxy_pass http://manager:8080/manger;
-#      proxy_set_header Host $http_host;
-#      proxy_set_header X-Real-IP $remote_addr;
-#      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-#      
-#      proxy_set_header X-Forwarded-Proto $scheme;
-#
-#      proxy_buffering off;
-#      proxy_request_buffering off;
-#    }    
-    
-#    location /manger/swagger-ui.html {
-#      proxy_pass http://manager:8080/swagger-ui.html/;
-#      proxy_set_header Host $http_host;
-#      proxy_set_header X-Real-IP $remote_addr;
-#      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-#      
-#      proxy_set_header X-Forwarded-Proto $scheme;
-#
-#      proxy_buffering off;
-#      proxy_request_buffering off;
-#    }
-    
-    location /tosca-sure/1.0.0/ {
-      proxy_pass http://sure-tosca:8081/tosca-sure/1.0.0/;
+    
+    location /manager {
+      proxy_pass http://manager:8080/manager;
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_buffering off;
+      proxy_request_buffering off;
+    }    
+    
+    location /swagger-ui.html {
+      proxy_pass http://manager:8080/swagger-ui.html;
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      proxy_buffering off;
+      proxy_request_buffering off;
+    }
+    
+    location /tosca-sure/1.0.0 {
+      proxy_pass http://sure-tosca:8081/tosca-sure/1.0.0;
       proxy_set_header Host $http_host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

sure_tosca-flask-server/sure_tosca/util.py

@@ -23,16 +23,16 @@ def _deserialize(data, klass):
         return deserialize_date(data)
     elif klass == datetime.datetime:
         return deserialize_datetime(data)
-    elif type(klass) == typing.GenericMeta:
-        if klass.__extra__ == list:
-            return _deserialize_list(data, klass.__args__[0])
-        if klass.__extra__ == dict:
-            return _deserialize_dict(data, klass.__args__[1])
-    # elif hasattr(klass, '__origin__'):
-    #     if klass.__origin__ == list:
+    # elif type(klass) == typing.GenericMeta:
+    #     if klass.__extra__ == list:
     #         return _deserialize_list(data, klass.__args__[0])
-    #     if klass.__origin__ == dict:
+    #     if klass.__extra__ == dict:
     #         return _deserialize_dict(data, klass.__args__[1])
+    elif hasattr(klass, '__origin__'):
+        if klass.__origin__ == list:
+            return _deserialize_list(data, klass.__args__[0])
+        if klass.__origin__ == dict:
+            return _deserialize_dict(data, klass.__args__[1])
     else:
         return deserialize_model(data, klass)