@typespec/http-client-python 0.14.3-dev.1 → 0.15.0

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

@@ -46,7 +46,7 @@ class OptionsDict(MutableMapping):
         self._data = options.copy() if options else {}
         self._validate_combinations()
 
-    def __getitem__(self, key: str) -> Any:
+    def __getitem__(self, key: str) -> Any: # pylint: disable=too-many-return-statements
         if key == "head-as-boolean" and self.get("azure-arm"):
             # override to always true if azure-arm is set
             return True
@@ -61,6 +61,15 @@ class OptionsDict(MutableMapping):
         if key == "package-mode" and self._data.get("packaging-files-dir"):
             # if packaging-files-dir is set, use it as package-mode
             return self._data["packaging-files-dir"]
+        if key == "generation-subdir":
+            data = self._data.get("generation-subdir")
+            if data:
+                # Remove leading dot or ./ from generation-subdir
+                if data.startswith("./"):
+                    data = data[2:]
+                elif data.startswith("."):
+                    data = data[1:]
+            return data
         return self._get_default(key)
 
     def __setitem__(self, key: str, value: Any) -> None:

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

@@ -52,7 +52,10 @@ class EnumValue(BaseType):
         """The python type used for RST syntax input and type annotation."""
 
         type_annotation = self.value_type.type_annotation(**kwargs)
-        enum_type_annotation = f"{self.enum_type.client_namespace}.models.{self.name}"
+        client_namespace = self.enum_type.client_namespace
+        if self.code_model.options.get("generation-subdir"):
+            client_namespace += f".{self.code_model.options['generation-subdir']}"
+        enum_type_annotation = f"{client_namespace}.models.{self.name}"
         return f"{type_annotation} or ~{enum_type_annotation}"
 
     def get_json_template_representation(

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

@@ -292,7 +292,10 @@ class GeneratedModelType(ModelType):
 
     def docstring_type(self, **kwargs: Any) -> str:
         type_annotation = self.type_annotation(need_model_alias=False, skip_quote=True, **kwargs)
-        return f"~{self.client_namespace}.models.{type_annotation}"
+        client_namespace = self.client_namespace
+        if self.code_model.options.get("generation-subdir"):
+            client_namespace += f".{self.code_model.options['generation-subdir']}"
+        return f"~{client_namespace}.models.{type_annotation}"
 
     def docstring_text(self, **kwargs: Any) -> str:
         return self.name

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

@@ -7,7 +7,7 @@ import logging
 import json
 from collections import namedtuple
 import re
-from typing import List, Any, Union
+from typing import List, Any, Union, Optional
 from pathlib import Path
 from packaging.version import parse as parse_version
 from jinja2 import PackageLoader, Environment, FileSystemLoader, StrictUndefined
@@ -165,7 +165,7 @@ class JinjaSerializer(ReaderAndWriter):
                 # add _metadata.json
                 if self.code_model.metadata:
                     self.write_file(
-                        generation_path / Path("_metadata.json"),
+                        Path("./_metadata.json"),
                         json.dumps(self.code_model.metadata, indent=2),
                     )
             elif client_namespace_type.clients:
@@ -376,8 +376,12 @@ class JinjaSerializer(ReaderAndWriter):
     def _serialize_and_write_version_file(
         self,
         general_serializer: GeneralSerializer,
+        namespace: Optional[str] = None,
     ):
-        generation_path = self.code_model.get_root_dir()
+        if namespace:
+            generation_path = self.code_model.get_generation_dir(namespace)
+        else:
+            generation_path = self.code_model.get_root_dir()
 
         def _read_version_file(original_version_file_name: str) -> str:
             return self.read_file(generation_path / original_version_file_name)
@@ -472,6 +476,9 @@ class JinjaSerializer(ReaderAndWriter):
 
         # write _version.py
         self._serialize_and_write_version_file(general_serializer)
+        # if there's a subdir, we need to write another version file in the subdir
+        if self.code_model.options.get("generation-subdir"):
+            self._serialize_and_write_version_file(general_serializer, namespace)
 
         # write the empty py.typed file
         pytyped_value = "# Marker file for PEP 561."

package/generator/pygen/__init__.py

@@ -46,7 +46,7 @@ class OptionsDict(MutableMapping):
         self._data = options.copy() if options else {}
         self._validate_combinations()
 
-    def __getitem__(self, key: str) -> Any:
+    def __getitem__(self, key: str) -> Any: # pylint: disable=too-many-return-statements
         if key == "head-as-boolean" and self.get("azure-arm"):
             # override to always true if azure-arm is set
             return True
@@ -61,6 +61,15 @@ class OptionsDict(MutableMapping):
         if key == "package-mode" and self._data.get("packaging-files-dir"):
             # if packaging-files-dir is set, use it as package-mode
             return self._data["packaging-files-dir"]
+        if key == "generation-subdir":
+            data = self._data.get("generation-subdir")
+            if data:
+                # Remove leading dot or ./ from generation-subdir
+                if data.startswith("./"):
+                    data = data[2:]
+                elif data.startswith("."):
+                    data = data[1:]
+            return data
         return self._get_default(key)
 
     def __setitem__(self, key: str, value: Any) -> None:

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

@@ -52,7 +52,10 @@ class EnumValue(BaseType):
         """The python type used for RST syntax input and type annotation."""
 
         type_annotation = self.value_type.type_annotation(**kwargs)
-        enum_type_annotation = f"{self.enum_type.client_namespace}.models.{self.name}"
+        client_namespace = self.enum_type.client_namespace
+        if self.code_model.options.get("generation-subdir"):
+            client_namespace += f".{self.code_model.options['generation-subdir']}"
+        enum_type_annotation = f"{client_namespace}.models.{self.name}"
         return f"{type_annotation} or ~{enum_type_annotation}"
 
     def get_json_template_representation(

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

@@ -292,7 +292,10 @@ class GeneratedModelType(ModelType):
 
     def docstring_type(self, **kwargs: Any) -> str:
         type_annotation = self.type_annotation(need_model_alias=False, skip_quote=True, **kwargs)
-        return f"~{self.client_namespace}.models.{type_annotation}"
+        client_namespace = self.client_namespace
+        if self.code_model.options.get("generation-subdir"):
+            client_namespace += f".{self.code_model.options['generation-subdir']}"
+        return f"~{client_namespace}.models.{type_annotation}"
 
     def docstring_text(self, **kwargs: Any) -> str:
         return self.name

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

@@ -7,7 +7,7 @@ import logging
 import json
 from collections import namedtuple
 import re
-from typing import List, Any, Union
+from typing import List, Any, Union, Optional
 from pathlib import Path
 from packaging.version import parse as parse_version
 from jinja2 import PackageLoader, Environment, FileSystemLoader, StrictUndefined
@@ -165,7 +165,7 @@ class JinjaSerializer(ReaderAndWriter):
                 # add _metadata.json
                 if self.code_model.metadata:
                     self.write_file(
-                        generation_path / Path("_metadata.json"),
+                        Path("./_metadata.json"),
                         json.dumps(self.code_model.metadata, indent=2),
                     )
             elif client_namespace_type.clients:
@@ -376,8 +376,12 @@ class JinjaSerializer(ReaderAndWriter):
     def _serialize_and_write_version_file(
         self,
         general_serializer: GeneralSerializer,
+        namespace: Optional[str] = None,
     ):
-        generation_path = self.code_model.get_root_dir()
+        if namespace:
+            generation_path = self.code_model.get_generation_dir(namespace)
+        else:
+            generation_path = self.code_model.get_root_dir()
 
         def _read_version_file(original_version_file_name: str) -> str:
             return self.read_file(generation_path / original_version_file_name)
@@ -472,6 +476,9 @@ class JinjaSerializer(ReaderAndWriter):
 
         # write _version.py
         self._serialize_and_write_version_file(general_serializer)
+        # if there's a subdir, we need to write another version file in the subdir
+        if self.code_model.options.get("generation-subdir"):
+            self._serialize_and_write_version_file(general_serializer, namespace)
 
         # write the empty py.typed file
         pytyped_value = "# Marker file for PEP 561."

package/package.json

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