jina-ai · deepankarm · Aug 5, 2021 · Aug 5, 2021
diff --git a/jina/peapods/runtimes/gateway/http/models.py b/jina/peapods/runtimes/gateway/http/models.py
@@ -110,9 +110,9 @@ def tags_updater(cls, values):
         extra_fields = {k: values[k] for k in set(values).difference(cls.__fields__)}
         if extra_fields:
             if 'tags' not in values:
-                values['tags'] = cls.__fields__['tags'].default
+                values['tags'] = {}
             if isinstance(values['tags'], Dict):
-                values['tags'].update({i: j for i, j in extra_fields.items()})
+                values['tags'].update(extra_fields)
         return values
 
     return root_validator(pre=True, allow_reuse=True)(tags_updater)
@@ -152,6 +152,7 @@ def protobuf_to_pydantic_model(
 
         field_type = PROTOBUF_TO_PYTHON_TYPE[f.type]
         default_value = f.default_value
+        default_factory = None
 
         if f.containing_oneof:
             # Proto Field type: oneof
@@ -169,11 +170,11 @@ def protobuf_to_pydantic_model(
             if f.message_type.name == 'Struct':
                 # Proto Field Type: google.protobuf.Struct
                 field_type = Dict
-                default_value = {}
+                default_factory = dict
             elif f.message_type.name == 'Timestamp':
                 # Proto Field Type: google.protobuf.Timestamp
                 field_type = datetime
-                default_value = datetime.now()
+                default_factory = datetime.now
             else:
                 # Proto field type: Proto message defined in jina.proto
                 if f.message_type.name == model_name:
@@ -187,7 +188,12 @@ def protobuf_to_pydantic_model(
         if f.label == FieldDescriptor.LABEL_REPEATED:
             field_type = List[field_type]
 
-        all_fields[field_name] = (field_type, Field(default=default_value))
+        all_fields[field_name] = (
+            field_type,
+            Field(default_factory=default_factory)
+            if default_factory
+            else Field(default=default_value),
+        )
 
         # some fixes on Doc.scores and Doc.evaluations
         if field_name in ('scores', 'evaluations'):

diff --git a/tests/unit/flow/test_flow_merge.py b/tests/unit/flow/test_flow_merge.py
@@ -31,7 +31,6 @@ def validate(req):
     assert len(chunk_ids) == 80
 
 
-# TODO(Deepankar): Gets stuck when `restful: True` - issues with `needs='gateway'`
 @pytest.mark.skip(
     'this should fail as explained in https://github.com/jina-ai/jina/pull/730'
 )
@@ -56,7 +55,6 @@ def test_this_will_fail(mocker, protocol):
     validate_callback(response_mock, validate)
 
 
-# TODO(Deepankar): Gets stuck when `restful: True` - issues with `needs='gateway'`
 @pytest.mark.timeout(180)
 @pytest.mark.parametrize('protocol', ['websocket', 'grpc', 'http'])
 def test_this_should_work(mocker, protocol):

diff --git a/...unit/peapods/runtimes/asyncio/__init__.py → ...unit/peapods/runtimes/gateway/__init__.py b/...unit/peapods/runtimes/asyncio/__init__.py → ...unit/peapods/runtimes/gateway/__init__.py
diff --git a/...peapods/runtimes/asyncio/rest/__init__.py → ...peapods/runtimes/gateway/http/__init__.py b/...peapods/runtimes/asyncio/rest/__init__.py → ...peapods/runtimes/gateway/http/__init__.py
diff --git a/...peapods/runtimes/asyncio/rest/test_app.py → ...peapods/runtimes/gateway/http/test_app.py b/...peapods/runtimes/asyncio/rest/test_app.py → ...peapods/runtimes/gateway/http/test_app.py
@@ -1,6 +1,8 @@
 import pytest
+import requests as req
 from fastapi.testclient import TestClient
 
+from jina import Executor, requests, Flow, DocumentArray
 from jina.logging.logger import JinaLogger
 from jina.parsers import set_gateway_parser
 from jina.peapods.runtimes.gateway.http import get_fastapi_app
@@ -17,3 +19,27 @@ def test_custom_swagger(p):
     with TestClient(app) as client:
         assert any('/docs' in r.path for r in app.routes)
         assert any('/openapi.json' in r.path for r in app.routes)
+
+
+class TestExecutor(Executor):
+    @requests
+    def empty(self, docs: 'DocumentArray', **kwargs):
+        print(f"# docs {docs}")
+
+
+def test_tag_update():
+    PORT_EXPOSE = 33300
+
+    f = Flow(
+        port_expose=PORT_EXPOSE,
+        restful=True,
+        protocol='http',
+    ).add(uses=TestExecutor)
+
+    with f:
+        d1 = {"data": [{"id": "1", "prop1": "val"}]}
+        d2 = {"data": [{"id": "2", "prop2": "val"}]}
+        r1 = req.post(f'http://localhost:{PORT_EXPOSE}/index', json=d1)
+        assert r1.json()['data']['docs'][0]['tags'] == {'prop1': 'val'}
+        r2 = req.post(f'http://localhost:{PORT_EXPOSE}/index', json=d2)
+        assert r2.json()['data']['docs'][0]['tags'] == {'prop2': 'val'}
diff --git a/...pods/runtimes/asyncio/rest/test_models.py → ...pods/runtimes/gateway/http/test_models.py b/...pods/runtimes/asyncio/rest/test_models.py → ...pods/runtimes/gateway/http/test_models.py