Add patch file compatability (#548)

autorest/codegen/serializers/__init__.py

@@ -42,6 +42,13 @@ def serialize(self, code_model: CodeModel) -> None:
             Path(".") if code_model.options["no_namespace_folders"] else Path(*(code_model.namespace.split(".")))
         )
 
+        # if there was a patch file before, we keep it
+        if self._autorestapi.read_file(namespace_path / "patch.py"):
+            self._autorestapi.write_file(
+                namespace_path / Path("patch.py"),
+                self._autorestapi.read_file(namespace_path / "patch.py")
+            )
+
         if code_model.schemas or code_model.enums:
             self._serialize_and_write_models_folder(code_model=code_model, env=env, namespace_path=namespace_path)
 
@@ -121,7 +128,6 @@ def _serialize_and_write_operations_folder(
                 )
 
 
-
     def _serialize_and_write_version_file(
         self, code_model: CodeModel, namespace_path: Path, general_serializer: GeneralSerializer
     ):

autorest/codegen/templates/init.py.jinja2

@@ -9,3 +9,11 @@ from ._version import VERSION
 __version__ = VERSION
 {% endif %}
 __all__ = ['{{ code_model.class_name }}']
+{% if not async_mode %}
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass
+{% endif %}

tasks.py

@@ -151,8 +151,6 @@ def regen_expected(c, opts, debug):
         cmd_line = '{} {}'.format(_AUTOREST_CMD_LINE, " ".join(args))
         print(Fore.YELLOW + f'Queuing up: {cmd_line}')
         cmds.append(cmd_line)
-        # Delete the old code, we can catch when it's not generating
-        shutil.rmtree(output_folder, ignore_errors=True)
 
     if len(cmds) == 1:
         success = run_autorest(cmds[0], debug=debug)
@@ -163,6 +161,8 @@ def regen_expected(c, opts, debug):
         success = all(result)
 
     if not success:
+        # Delete the old code, we can catch when it's not generating
+        shutil.rmtree(output_folder, ignore_errors=True)
         raise SystemExit("Autorest generation fails")
 
 def run_autorest(cmd_line, debug=False):

test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestDurationTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestParameterGroupingTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/AzureReport/azurereport/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestReportServiceForAzure']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestAzureSpecialParametersTestClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestParameterizedHostTestClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestParameterizedHostTestPagingClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/Head/head/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestHeadTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestHeadExceptionTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/Lro/lro/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestLongRunningOperationTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/Paging/paging/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestPagingTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['StorageManagementClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['MicrosoftAzureTestUrl']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/__init__.py

@@ -8,3 +8,9 @@
 
 from ._multiapi_service_client import MultiapiServiceClient
 __all__ = ['MultiapiServiceClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/__init__.py

@@ -8,3 +8,9 @@
 
 from ._multiapi_service_client import MultiapiServiceClient
 __all__ = ['MultiapiServiceClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/__init__.py

@@ -8,3 +8,9 @@
 
 from ._multiapi_service_client import MultiapiServiceClient
 __all__ = ['MultiapiServiceClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/__init__.py

@@ -8,3 +8,9 @@
 
 from ._multiapi_service_client import MultiapiServiceClient
 __all__ = ['MultiapiServiceClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/__init__.py

@@ -8,3 +8,9 @@
 
 from ._multiapi_service_client import MultiapiServiceClient
 __all__ = ['MultiapiServiceClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/__init__.py

@@ -8,3 +8,9 @@
 
 from ._multiapi_service_client import MultiapiServiceClient
 __all__ = ['MultiapiServiceClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/__init__.py

@@ -8,3 +8,9 @@
 
 from ._multiapi_service_client import MultiapiServiceClient
 __all__ = ['MultiapiServiceClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/__init__.py

@@ -8,3 +8,9 @@
 
 from ._multiapi_service_client import MultiapiServiceClient
 __all__ = ['MultiapiServiceClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/AcceptanceTests/asynctests/test_string_tests.py

@@ -144,3 +144,6 @@ async def test_enum_referenced(self, client):
     async def test_enum_referenced_constant(self, client):
         await client.enum.put_referenced_constant()
         assert (await client.enum.get_referenced_constant()).color_constant ==  Colors.green_color.value
+
+    def test_patch_file(self):
+        from bodystring.models import PatchAddedModel

test/vanilla/AcceptanceTests/test_string_tests.py

@@ -132,3 +132,7 @@ def test_enum_referenced(self, client):
     def test_enum_referenced_constant(self, client):
         client.enum.put_referenced_constant()
         assert client.enum.get_referenced_constant().color_constant ==  Colors.green_color.value
+
+    def test_patch_file(self):
+        from bodystring.models import PatchAddedModel
+

test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AdditionalPropertiesClient']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestSwaggerBATArrayService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestBoolTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestSwaggerBATByteService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestComplexTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestDateTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestDateTimeTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestRFC1123DateTimeTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestSwaggerBATDictionaryService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestDurationTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestSwaggerBATFileService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestIntegerTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass

test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/__init__.py

@@ -11,3 +11,9 @@
 
 __version__ = VERSION
 __all__ = ['AutoRestNumberTestService']
+
+try:
+    from .patch import patch_sdk
+    patch_sdk()
+except ImportError:
+    pass