@typespec/http-client-python 0.6.1 → 0.6.3

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/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/templates/serialization.py.jinja2

@@ -184,73 +184,7 @@ try:
 except NameError:
     _long_type = int
 
-
-class UTC(datetime.tzinfo):
-    """Time Zone info for handling UTC"""
-
-    def utcoffset(self, dt):
-        """UTF offset for UTC is 0.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The offset
-        :rtype: datetime.timedelta
-        """
-        return datetime.timedelta(0)
-
-    def tzname(self, dt):
-        """Timestamp representation.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The timestamp representation
-        :rtype: str
-        """
-        return "Z"
-
-    def dst(self, dt):
-        """No daylight saving for UTC.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The daylight saving time
-        :rtype: datetime.timedelta
-        """
-        return datetime.timedelta(hours=1)
-
-
-try:
-    from datetime import timezone as _FixedOffset  # type: ignore
-except ImportError:  # Python 2.7
-
-    class _FixedOffset(datetime.tzinfo):  # type: ignore
-        """Fixed offset in minutes east from UTC.
-        Copy/pasted from Python doc
-        :param datetime.timedelta offset: offset in timedelta format
-        """
-
-        def __init__(self, offset) -> None:
-            self.__offset = offset
-
-        def utcoffset(self, dt):
-            return self.__offset
-
-        def tzname(self, dt):
-            return str(self.__offset.total_seconds() / 3600)
-
-        def __repr__(self):
-            return "<FixedOffset {}>".format(self.tzname(None))
-
-        def dst(self, dt):
-            return datetime.timedelta(0)
-
-        def __getinitargs__(self):
-            return (self.__offset,)
-
-
-try:
-    from datetime import timezone
-
-    TZ_UTC = timezone.utc
-except ImportError:
-    TZ_UTC = UTC()  # type: ignore
+TZ_UTC = datetime.timezone.utc
 
 _FLATTEN = re.compile(r"(?<!\\)\.")
 
@@ -2050,7 +1984,7 @@ class Deserializer:
         try:
             parsed_date = email.utils.parsedate_tz(attr)  # type: ignore
             date_obj = datetime.datetime(
-                *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
+                *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
             )
             if not date_obj.tzinfo:
                 date_obj = date_obj.astimezone(tz=TZ_UTC)

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/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/templates/serialization.py.jinja2

@@ -184,73 +184,7 @@ try:
 except NameError:
     _long_type = int
 
-
-class UTC(datetime.tzinfo):
-    """Time Zone info for handling UTC"""
-
-    def utcoffset(self, dt):
-        """UTF offset for UTC is 0.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The offset
-        :rtype: datetime.timedelta
-        """
-        return datetime.timedelta(0)
-
-    def tzname(self, dt):
-        """Timestamp representation.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The timestamp representation
-        :rtype: str
-        """
-        return "Z"
-
-    def dst(self, dt):
-        """No daylight saving for UTC.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The daylight saving time
-        :rtype: datetime.timedelta
-        """
-        return datetime.timedelta(hours=1)
-
-
-try:
-    from datetime import timezone as _FixedOffset  # type: ignore
-except ImportError:  # Python 2.7
-
-    class _FixedOffset(datetime.tzinfo):  # type: ignore
-        """Fixed offset in minutes east from UTC.
-        Copy/pasted from Python doc
-        :param datetime.timedelta offset: offset in timedelta format
-        """
-
-        def __init__(self, offset) -> None:
-            self.__offset = offset
-
-        def utcoffset(self, dt):
-            return self.__offset
-
-        def tzname(self, dt):
-            return str(self.__offset.total_seconds() / 3600)
-
-        def __repr__(self):
-            return "<FixedOffset {}>".format(self.tzname(None))
-
-        def dst(self, dt):
-            return datetime.timedelta(0)
-
-        def __getinitargs__(self):
-            return (self.__offset,)
-
-
-try:
-    from datetime import timezone
-
-    TZ_UTC = timezone.utc
-except ImportError:
-    TZ_UTC = UTC()  # type: ignore
+TZ_UTC = datetime.timezone.utc
 
 _FLATTEN = re.compile(r"(?<!\\)\.")
 
@@ -2050,7 +1984,7 @@ class Deserializer:
         try:
             parsed_date = email.utils.parsedate_tz(attr)  # type: ignore
             date_obj = datetime.datetime(
-                *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
+                *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
             )
             if not date_obj.tzinfo:
                 date_obj = date_obj.astimezone(tz=TZ_UTC)

package/package.json

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