add ge

Author: AllyW

src/aaz_dev/cli/controller/az_arg_group_generator.py

@@ -297,7 +297,7 @@ def render_arg_base(arg, cmd_ctx, arg_kwargs=None):
     elif isinstance(arg, CMDByteArgBase):
         raise NotImplementedError()
     elif isinstance(arg, CMDBinaryArgBase):
-        arg_type = "AAZFileBytesArg"
+        arg_type = "AAZFileUploadArg"
     elif isinstance(arg, CMDStringArgBase):
         arg_type = "AAZStrArg"
         enum_kwargs = parse_arg_enum(arg.enum)

src/aaz_dev/cli/controller/az_operation_generator.py

@@ -1,5 +1,5 @@
 from command.model.configuration import (
-    CMDHttpOperation, CMDHttpRequestJsonBody, CMDArraySchema, CMDInstanceUpdateOperation, CMDRequestJson, CMDHttpRequestBytesBody, CMDRequestBytes,
+    CMDHttpOperation, CMDHttpRequestJsonBody, CMDArraySchema, CMDInstanceUpdateOperation, CMDRequestJson, CMDHttpRequestBinaryBody, CMDRequestBinary,
     CMDHttpResponseJsonBody, CMDObjectSchema, CMDSchema, CMDStringSchemaBase, CMDIntegerSchemaBase, CMDFloatSchemaBase,
     CMDBooleanSchemaBase, CMDObjectSchemaBase, CMDArraySchemaBase, CMDClsSchemaBase, CMDJsonInstanceUpdateAction,
     CMDObjectSchemaDiscriminator, CMDSchemaEnum, CMDJsonInstanceCreateAction, CMDJsonInstanceDeleteAction, CMDBinarySchema,
@@ -114,11 +114,13 @@ def __init__(self, name, cmd_ctx, operation, client_endpoints):
         self.content = None
         self.form_content = None
         self.stream_content = None
+        self.content_as_binary = None
         if self._operation.http.request.body:
             body = self._operation.http.request.body
             if isinstance(body, CMDHttpRequestJsonBody):
                 self.content = AzHttpRequestContentGenerator(self._cmd_ctx, body)
-            elif isinstance(body, CMDHttpRequestBytesBody):
+            elif isinstance(body, CMDHttpRequestBinaryBody):
+                self.content_as_binary = True
                 self.content = AzHttpRequestContentBytesGenerator(self._cmd_ctx, body)
             else:
                 raise NotImplementedError()
@@ -262,13 +264,19 @@ def header_parameters(self):
                     True,
                     {}
                 ])
-            elif isinstance(body, CMDHttpRequestBytesBody):
+            elif isinstance(body, CMDHttpRequestBinaryBody):
                 parameters.append([
                     "Content-Type",
                     "application/octet-stream",
                     True,
                     {}
                 ])
+                parameters.append([
+                    "Content-Length",
+                    "self.ctx.file_length",
+                    False,
+                    {}
+                ])
         if self.success_responses:
             for response in self.success_responses:
                 if response._response.body is not None and isinstance(response._response.body, CMDHttpResponseJsonBody):
@@ -520,12 +528,10 @@ def iter_scopes(self):
             yield scopes
 
 class AzHttpRequestContentBytesGenerator:
-    VALUE_NAME = "_content_value"
-    BUILDER_NAME = "_builder"
 
     def __init__(self, cmd_ctx, body):
         self._cmd_ctx = cmd_ctx
-        assert isinstance(body.bytes, CMDRequestBytes)
+        assert isinstance(body.bytes, CMDRequestBinary)
         self._bodycontent = body.bytes
         self.ref = None
         if self._bodycontent.ref:
@@ -537,11 +543,6 @@ def __init__(self, cmd_ctx, body):
             if self._bodycontent.schema.arg:
                 self.arg_key, hide = self._cmd_ctx.get_argument(self._bodycontent.schema.arg)
                 assert not hide
-            self.typ, self.typ_kwargs, self.cls_builder_name = render_schema(
-                self._bodycontent.schema, self._cmd_ctx.update_clses, name=self._bodycontent.schema.name)
-
-    def iter_scopes(self):
-        pass
 
 
 class AzHttpResponseGenerator:
@@ -1024,7 +1025,7 @@ def render_schema_base(schema, cls_map, schema_kwargs=None):
     elif isinstance(schema, CMDIdentityObjectSchemaBase):
         schema_type = "AAZIdentityObjectType"
     elif isinstance(schema, CMDBinarySchema):
-        schema_type = "AAZBytesType"
+        schema_type = "AAZFileUploadType"
     elif isinstance(schema, CMDObjectSchemaBase):
         if schema.props or schema.discriminators:
             schema_type = "AAZObjectType"

src/aaz_dev/cli/templates/aaz/command/_cmd.py.j2

@@ -236,11 +236,21 @@ class {{ leaf.cls_name }}(
 
     @register_callback
     def pre_operations(self):
+        {%- if leaf.http_operations[0].content is not none and leaf.http_operations[0].content_as_binary is not none %}
+        self.ctx.file_content, self.ctx.file_handler, self.ctx.file_length = {{ leaf.http_operations[0].content.arg_key }}.to_serialized_data()
+        {%- else %}
         pass
+        {%- endif %}
 
     @register_callback
     def post_operations(self):
+        {%- if leaf.http_operations[0].content is not none and leaf.http_operations[0].content_as_binary is not none %}
+        if self.ctx.file_handler is not None:
+            self.ctx.file_handler.close()
+            self.ctx.file_handler = None
+        {%- else %}
         pass
+        {%- endif %}
 
     {%- for op in leaf.operations %}
     {%- if op.name in ("pre_instance_update", "post_instance_update", "post_instance_create")  %}
@@ -485,7 +495,7 @@ class {{ leaf.cls_name }}(
             return parameters
         {%- endif %}
 
-        {%- if op.content is not none %}
+        {%- if op.content is not none and op.content_as_binary is none %}
 
         @property
         def content(self):
@@ -548,6 +558,13 @@ class {{ leaf.cls_name }}(
             return self.serialize_content({{ op.content.VALUE_NAME }})
         {%- endif %}
 
+        {%- if op.content is not none and op.content_as_binary is not none %}
+
+        @property
+        def content(self):
+            return self.ctx.file_content
+        {%- endif %}
+
         {%- if op.form_content is not none %}
 
         @property
@@ -556,6 +573,13 @@ class {{ leaf.cls_name }}(
             return None
         {%- endif %}
 
+        {%- if op.content is not none and op.content_as_binary is not none %}
+
+        @property
+        def stream_content(self):
+            return self.ctx.file_handler
+        {%- endif %}
+
         {%- if op.stream_content is not none %}
 
         @property

src/aaz_dev/command/model/configuration/__init__.py

@@ -35,7 +35,7 @@
     CMDConditionAndOperator, CMDConditionOrOperator, CMDConditionNotOperator, CMDConditionHasValueOperator, \
     CMDCondition
 from ._configuration import CMDConfiguration
-from ._content import CMDRequestJson, CMDResponseJson, CMDRequestBytes
+from ._content import CMDRequestJson, CMDResponseJson, CMDRequestBinary
 from ._example import CMDCommandExample
 from ._fields import CMDBooleanField, CMDStageField, CMDVariantField, CMDClassField, \
     CMDPrimitiveField, CMDRegularExpressionField, CMDVersionField, CMDResourceIdField, CMDCommandNameField, \
@@ -47,7 +47,7 @@
     CMDHttpRequest, \
     CMDHttpResponseHeaderItem, CMDHttpResponseHeader, CMDHttpResponse, \
     CMDHttpAction
-from ._http_request_body import CMDHttpRequestBody, CMDHttpRequestJsonBody, CMDHttpRequestBytesBody
+from ._http_request_body import CMDHttpRequestBody, CMDHttpRequestJsonBody, CMDHttpRequestBinaryBody
 from ._http_response_body import CMDHttpResponseBody, CMDHttpResponseJsonBody
 from ._instance_create import CMDInstanceCreateAction, CMDJsonInstanceCreateAction
 from ._instance_delete import CMDInstanceDeleteAction, CMDJsonInstanceDeleteAction

src/aaz_dev/command/model/configuration/_arg_builder.py

@@ -197,8 +197,7 @@ def get_sub_args(self):
                             item.arg = discriminator_mapping[prop.name][item.value]
                     continue
                 sub_builder = self.get_sub_builder(schema=prop, ref_args=sub_ref_args)
-                sub_arg = sub_builder.get_args()
-                sub_args.extend(sub_arg)
+                sub_args.extend(sub_builder.get_args())
 
             self.schema.props = [prop for prop in self.schema.props if prop not in removed]
             if isinstance(self.schema, CMDIdentityObjectSchema) and (not self._is_update_action or self.schema.action):

src/aaz_dev/command/model/configuration/_content.py

@@ -63,8 +63,8 @@ def reformat(self, schema_cls_map, **kwargs):
     def register_cls(self, cls_register_map, **kwargs):
         _iter_over_schema_for_cls_register(self.schema, cls_register_map)
 
-class CMDRequestBytes(Model):
-    """Used for Request Bytes Body"""
+class CMDRequestBinary(Model):
+    """Used for Request Binary Body"""
 
     ref = CMDVariantField()
 

src/aaz_dev/command/model/configuration/_http_request_body.py

@@ -1,7 +1,7 @@
 from schematics.models import Model
 from schematics.types import ModelType
 
-from ._content import CMDRequestJson, CMDRequestBytes
+from ._content import CMDRequestJson, CMDRequestBinary
 
 
 class CMDHttpRequestBody(Model):
@@ -51,10 +51,10 @@ def reformat(self, **kwargs):
     def register_cls(self, **kwargs):
         self.json.register_cls(**kwargs)
 
-class CMDHttpRequestBytesBody(CMDHttpRequestBody):
+class CMDHttpRequestBinaryBody(CMDHttpRequestBody):
     POLYMORPHIC_KEY = "bytes"
 
-    bytes = ModelType(CMDRequestBytes, required=True)
+    bytes = ModelType(CMDRequestBinary, required=True)
 
     def generate_args(self, ref_args, var_prefix=None):
         return self.bytes.generate_args(ref_args=ref_args, var_prefix=var_prefix)

src/aaz_dev/swagger/controller/command_generator.py

@@ -6,7 +6,7 @@
 from command.model.configuration import CMDCommandGroup, CMDCommand, CMDHttpOperation, CMDHttpRequest, \
     CMDSchemaDefault, CMDHttpResponseJsonBody, CMDArrayOutput, CMDJsonInstanceUpdateAction, \
     CMDInstanceUpdateOperation, CMDRequestJson, DEFAULT_CONFIRMATION_PROMPT, CMDClsSchemaBase, CMDHttpResponse, \
-    CMDResponseJson, CMDResource
+    CMDResponseJson, CMDResource, CMDHttpRequestBinaryBody
 from swagger.model.schema.cmd_builder import CMDBuilder
 from swagger.model.schema.fields import MutabilityEnum
 from swagger.model.schema.path_item import PathItem
@@ -404,10 +404,13 @@ def create_draft_command_group(self, resource,
             delete_command.confirmation = DEFAULT_CONFIRMATION_PROMPT   # add confirmation for delete command by default
             command_group.commands.append(delete_command)
 
+        skip_update = False
         if path_item.put is not None and 'put' in methods:
             cmd_builder = CMDBuilder(path=resource.path, method='put', mutability=MutabilityEnum.Create,
                                      parameterized_host=parameterized_host)
             op = self.generate_operation(cmd_builder, path_item, instance_var)
+            if isinstance(op.http.request.body, CMDHttpRequestBinaryBody):
+                skip_update = True
             create_command = self.generate_command(path_item, resource, instance_var, cmd_builder, op)
             command_group.commands.append(create_command)
 
@@ -426,29 +429,30 @@ def create_draft_command_group(self, resource,
             command_group.commands.append(head_command)
 
         # update command
-        if update_by is None:
-            update_by_patch_command = None
-            update_by_generic_command = None
-            if path_item.patch is not None and 'patch' in methods:
-                cmd_builder = CMDBuilder(path=resource.path, method='patch', mutability=MutabilityEnum.Update,
-                                         parameterized_host=parameterized_host)
-                op = self.generate_operation(cmd_builder, path_item, instance_var)
-                update_by_patch_command = self.generate_command(path_item, resource, instance_var, cmd_builder, op)
-            if path_item.get is not None and path_item.put is not None and 'get' in methods and 'put' in methods:
-                cmd_builder = CMDBuilder(path=resource.path,
-                                         parameterized_host=parameterized_host)
-                get_op = self.generate_operation(
-                    cmd_builder, path_item, instance_var, method='get', mutability=MutabilityEnum.Read)
-                put_op = self.generate_operation(
-                    cmd_builder, path_item, instance_var, method='put', mutability=MutabilityEnum.Update)
-                update_by_generic_command = self.generate_generic_update_command(path_item, resource, instance_var, cmd_builder, get_op, put_op)
-            # generic update command first, patch update command after that
-            if update_by_generic_command:
-                command_group.commands.append(update_by_generic_command)
-            elif update_by_patch_command:
-                command_group.commands.append(update_by_patch_command)
-        else:
-            if update_by == 'GenericOnly':
+        if not skip_update:
+            if update_by is None:
+                update_by_patch_command = None
+                update_by_generic_command = None
+                if path_item.patch is not None and 'patch' in methods:
+                    cmd_builder = CMDBuilder(path=resource.path, method='patch', mutability=MutabilityEnum.Update,
+                                             parameterized_host=parameterized_host)
+                    op = self.generate_operation(cmd_builder, path_item, instance_var)
+                    update_by_patch_command = self.generate_command(path_item, resource, instance_var, cmd_builder, op)
+                if path_item.get is not None and path_item.put is not None and 'get' in methods and 'put' in methods:
+                    cmd_builder = CMDBuilder(path=resource.path,
+                                             parameterized_host=parameterized_host)
+                    get_op = self.generate_operation(
+                        cmd_builder, path_item, instance_var, method='get', mutability=MutabilityEnum.Read)
+                    put_op = self.generate_operation(
+                        cmd_builder, path_item, instance_var, method='put', mutability=MutabilityEnum.Update)
+                    update_by_generic_command = self.generate_generic_update_command(path_item, resource, instance_var,
+                                                                                     cmd_builder, get_op, put_op)
+                # generic update command first, patch update command after that
+                if update_by_generic_command:
+                    command_group.commands.append(update_by_generic_command)
+                elif update_by_patch_command:
+                    command_group.commands.append(update_by_patch_command)
+            elif update_by == 'GenericOnly':
                 if path_item.get is None or path_item.put is None:
                     raise exceptions.InvalidAPIUsage(f"Invalid update_by resource: resource needs to have 'get' and 'put' operations: '{resource}'")
                 if 'get' not in methods or 'put' not in methods:

src/aaz_dev/swagger/model/schema/operation.py

@@ -5,7 +5,7 @@
 from schematics.types import StringType, ModelType, ListType, DictType, BooleanType, PolyModelType
 
 from command.model.configuration import CMDHttpOperation, CMDHttpAction, CMDHttpRequest, CMDHttpRequestPath, \
-    CMDHttpRequestQuery, CMDHttpRequestHeader, CMDHttpRequestJsonBody, CMDRequestJson, CMDRequestBytes, CMDHttpRequestBytesBody, CMDHttpOperationLongRunning
+    CMDHttpRequestQuery, CMDHttpRequestHeader, CMDHttpRequestJsonBody, CMDRequestJson, CMDRequestBinary, CMDHttpRequestBinaryBody, CMDHttpOperationLongRunning
 from swagger.utils import exceptions
 from swagger.utils.tools import swagger_resource_path_to_resource_id_template
 from .example_item import XmsExamplesField
@@ -225,8 +225,8 @@ def to_cmd(self, builder, parent_parameters, host_path, **kwargs):
             if isinstance(model, CMDRequestJson):
                 request.body = CMDHttpRequestJsonBody()
                 request.body.json = model
-            elif isinstance(model, CMDRequestBytes):
-                request.body = CMDHttpRequestBytesBody()
+            elif isinstance(model, CMDRequestBinary):
+                request.body = CMDHttpRequestBinaryBody()
                 request.body.bytes = model
             else:
                 raise NotImplementedError()

src/aaz_dev/swagger/model/schema/parameter.py

@@ -1,7 +1,7 @@
 import logging
 
 from command.model.configuration import CMDRequestJson, CMDBooleanSchema, CMDStringSchema, CMDObjectSchema, \
-    CMDArraySchema, CMDFloatSchema, CMDIntegerSchema, CMDBinarySchema, CMDRequestBytes
+    CMDArraySchema, CMDFloatSchema, CMDIntegerSchema, CMDBinarySchema, CMDRequestBinary
 from schematics.models import Model
 from schematics.types import StringType, BooleanType, ModelType, PolyModelType, BaseType
 from swagger.utils import exceptions
@@ -206,7 +206,7 @@ def to_cmd(self, builder, **kwargs):
             )
             return None
         if isinstance(v, CMDBinarySchema):
-            model = CMDRequestBytes()
+            model = CMDRequestBinary()
             model.schema = v
             v.required = self.required
         elif isinstance(v, (