@typespec/http-client-python 0.6.0 → 0.6.2

package/generator/build/lib/pygen/black.py

@@ -60,7 +60,7 @@ class BlackScriptPlugin(Plugin):
         except:
             _LOGGER.error("Error: failed to format %s", file)
             raise
-        if len(file_content.splitlines()) > 1000:
+        if len(file_content.splitlines()) > 1000 and "pylint: disable=too-many-lines" not in file_content:
             file_content = "# pylint: disable=too-many-lines\n" + file_content
         self.write_file(file, file_content)
 

package/generator/build/lib/pygen/codegen/models/credential_types.py

@@ -155,7 +155,7 @@ class TokenCredentialType(CredentialType[Union[BearerTokenCredentialPolicyType,
 
     @property
     def type_description(self) -> str:
-        return "TokenCredential"
+        return "token credential"
 
     @property
     def credentials_subfolder(self) -> str:

package/generator/build/lib/pygen/codegen/serializers/__init__.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 import logging
 from collections import namedtuple
+import re
 from typing import List, Any, Union
 from pathlib import Path
 from jinja2 import PackageLoader, Environment, FileSystemLoader, StrictUndefined
@@ -94,6 +95,19 @@ class JinjaSerializer(ReaderAndWriter):
         async_loop = AsyncInfo(async_mode=True, async_path="aio/")
         return [sync_loop, async_loop] if self.has_aio_folder else [sync_loop]
 
+    @property
+    def keep_version_file(self) -> bool:
+        if self.options.get("keep_version_file"):
+            return True
+        # If the version file is already there and the version is greater than the current version, keep it.
+        try:
+            serialized_version_file = self.read_file(self.exec_path(self.code_model.namespace) / "_version.py")
+            match = re.search(r'VERSION\s*=\s*"([^"]+)"', str(serialized_version_file))
+            serialized_version = match.group(1) if match else ""
+        except (FileNotFoundError, IndexError):
+            serialized_version = ""
+        return serialized_version > self.code_model.options["package_version"]
+
     def serialize(self) -> None:
         env = Environment(
             loader=PackageLoader("pygen.codegen", "templates"),
@@ -193,6 +207,9 @@ class JinjaSerializer(ReaderAndWriter):
             file = template_name.replace(".jinja2", "")
             output_name = root_of_sdk / file
             if not self.read_file(output_name) or file in _REGENERATE_FILES:
+                if self.keep_version_file and file == "setup.py":
+                    # don't regenerate setup.py file if the version file is more up to date
+                    continue
                 self.write_file(
                     output_name,
                     serializer.serialize_package_file(template_name, **params),
@@ -329,10 +346,9 @@ class JinjaSerializer(ReaderAndWriter):
                 _read_version_file(original_version_file_name),
             )
 
-        keep_version_file = self.code_model.options["keep_version_file"]
-        if keep_version_file and _read_version_file("_version.py"):
+        if self.keep_version_file and _read_version_file("_version.py"):
             _write_version_file(original_version_file_name="_version.py")
-        elif keep_version_file and _read_version_file("version.py"):
+        elif self.keep_version_file and _read_version_file("version.py"):
             _write_version_file(original_version_file_name="version.py")
         elif self.code_model.options["package_version"]:
             self.write_file(

package/generator/build/lib/pygen/codegen/serializers/model_serializer.py

@@ -116,7 +116,7 @@ class _ModelSerializer(BaseSerializer, ABC):
     def initialize_properties(self, model: ModelType) -> List[str]: ...
 
     def need_init(self, model: ModelType) -> bool:
-        return (not model.internal) and bool(self.init_line(model) or model.discriminator)
+        return bool(self.init_line(model) or model.discriminator)
 
     def pylint_disable_items(self, model: ModelType) -> List[str]:
         if model.flattened_property or self.initialize_properties(model):

package/generator/component-detection-pip-report.json

@@ -123,9 +123,9 @@
     "implementation_version": "3.8.10",
     "os_name": "posix",
     "platform_machine": "x86_64",
-    "platform_release": "5.15.0-1075-azure",
+    "platform_release": "5.15.0-1078-azure",
     "platform_system": "Linux",
-    "platform_version": "#84~20.04.1-Ubuntu SMP Mon Nov 4 18:58:41 UTC 2024",
+    "platform_version": "#87~20.04.1-Ubuntu SMP Wed Dec 18 20:14:54 UTC 2024",
     "python_full_version": "3.8.10",
     "platform_python_implementation": "CPython",
     "python_version": "3.8",

package/generator/pygen/black.py

@@ -60,7 +60,7 @@ class BlackScriptPlugin(Plugin):
         except:
             _LOGGER.error("Error: failed to format %s", file)
             raise
-        if len(file_content.splitlines()) > 1000:
+        if len(file_content.splitlines()) > 1000 and "pylint: disable=too-many-lines" not in file_content:
             file_content = "# pylint: disable=too-many-lines\n" + file_content
         self.write_file(file, file_content)
 

package/generator/pygen/codegen/models/credential_types.py

@@ -155,7 +155,7 @@ class TokenCredentialType(CredentialType[Union[BearerTokenCredentialPolicyType,
 
     @property
     def type_description(self) -> str:
-        return "TokenCredential"
+        return "token credential"
 
     @property
     def credentials_subfolder(self) -> str:

package/generator/pygen/codegen/serializers/__init__.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 import logging
 from collections import namedtuple
+import re
 from typing import List, Any, Union
 from pathlib import Path
 from jinja2 import PackageLoader, Environment, FileSystemLoader, StrictUndefined
@@ -94,6 +95,19 @@ class JinjaSerializer(ReaderAndWriter):
         async_loop = AsyncInfo(async_mode=True, async_path="aio/")
         return [sync_loop, async_loop] if self.has_aio_folder else [sync_loop]
 
+    @property
+    def keep_version_file(self) -> bool:
+        if self.options.get("keep_version_file"):
+            return True
+        # If the version file is already there and the version is greater than the current version, keep it.
+        try:
+            serialized_version_file = self.read_file(self.exec_path(self.code_model.namespace) / "_version.py")
+            match = re.search(r'VERSION\s*=\s*"([^"]+)"', str(serialized_version_file))
+            serialized_version = match.group(1) if match else ""
+        except (FileNotFoundError, IndexError):
+            serialized_version = ""
+        return serialized_version > self.code_model.options["package_version"]
+
     def serialize(self) -> None:
         env = Environment(
             loader=PackageLoader("pygen.codegen", "templates"),
@@ -193,6 +207,9 @@ class JinjaSerializer(ReaderAndWriter):
             file = template_name.replace(".jinja2", "")
             output_name = root_of_sdk / file
             if not self.read_file(output_name) or file in _REGENERATE_FILES:
+                if self.keep_version_file and file == "setup.py":
+                    # don't regenerate setup.py file if the version file is more up to date
+                    continue
                 self.write_file(
                     output_name,
                     serializer.serialize_package_file(template_name, **params),
@@ -329,10 +346,9 @@ class JinjaSerializer(ReaderAndWriter):
                 _read_version_file(original_version_file_name),
             )
 
-        keep_version_file = self.code_model.options["keep_version_file"]
-        if keep_version_file and _read_version_file("_version.py"):
+        if self.keep_version_file and _read_version_file("_version.py"):
             _write_version_file(original_version_file_name="_version.py")
-        elif keep_version_file and _read_version_file("version.py"):
+        elif self.keep_version_file and _read_version_file("version.py"):
             _write_version_file(original_version_file_name="version.py")
         elif self.code_model.options["package_version"]:
             self.write_file(

package/generator/pygen/codegen/serializers/model_serializer.py

@@ -116,7 +116,7 @@ class _ModelSerializer(BaseSerializer, ABC):
     def initialize_properties(self, model: ModelType) -> List[str]: ...
 
     def need_init(self, model: ModelType) -> bool:
-        return (not model.internal) and bool(self.init_line(model) or model.discriminator)
+        return bool(self.init_line(model) or model.discriminator)
 
     def pylint_disable_items(self, model: ModelType) -> List[str]:
         if model.flattened_property or self.initialize_properties(model):

package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py

@@ -92,7 +92,7 @@ async def test_operation(client: AccessClient):
 @pytest.mark.asyncio
 async def test_discriminator(client: AccessClient):
     result = await client.relative_model_in_operation._discriminator(kind="real")
-    assert result == models._models.RealModel(name="Madge", kind="real")
+    assert result == models._models.RealModel(name="Madge")
 
     with pytest.raises(ImportError):
         from specs.azure.clientgenerator.core.access.models import RealModel

package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_access.py

@@ -83,7 +83,7 @@ def test_operation(client: AccessClient):
 
 def test_discriminator(client: AccessClient):
     result = client.relative_model_in_operation._discriminator(kind="real")
-    assert result == models._models.RealModel(name="Madge", kind="real")
+    assert result == models._models.RealModel(name="Madge")
 
     with pytest.raises(ImportError):
         from specs.azure.clientgenerator.core.access.models import RealModel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",