solve conflicts

Author: ChenxiJiang333

packages/typespec-python/scripts/eng/regenerate.ts

@@ -97,7 +97,10 @@ const AZURE_EMITTER_OPTIONS: Record<string, Record<string, string> | Record<stri
         "namespace": "client.structure.twooperationgroup",
     },
     "client/naming": {
-        namespace: "client.naming",
+        namespace: "client.naming.main",
+    },
+    "client/naming/enum-conflict": {
+        namespace: "client.naming.enumconflict",
     },
     "client/overload": {
         namespace: "client.overload",

packages/typespec-python/test/azure/generated/client-naming-enum-conflict/apiview-properties.json

@@ -1,8 +1,8 @@
 {
     "CrossLanguagePackageId": "Client.Naming.EnumConflict",
     "CrossLanguageDefinitionId": {
-        "client.naming.enumconflict.firstnamespace.models.FirstModel": "Client.Naming.EnumConflict.FirstNamespace.FirstModel",
-        "client.naming.enumconflict.secondnamespace.models.SecondModel": "Client.Naming.EnumConflict.SecondNamespace.SecondModel",
+        "client.naming.enumconflict.models.FirstModel": "Client.Naming.EnumConflict.FirstNamespace.FirstModel",
+        "client.naming.enumconflict.models.SecondModel": "Client.Naming.EnumConflict.SecondNamespace.SecondModel",
         "client.naming.enumconflict.models.Status": "Client.Naming.EnumConflict.FirstNamespace.Status",
         "client.naming.enumconflict.models.SecondStatus": "Client.Naming.EnumConflict.SecondNamespace.Status",
         "client.naming.enumconflict.operations.FirstOperationsOperations.first": "Client.Naming.EnumConflict.FirstOperations.first",

packages/typespec-python/test/azure/generated/client-naming-enum-conflict/client/naming/enumconflict/_utils/model_base.py

@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.

packages/typespec-python/test/azure/generated/client-naming-enum-conflict/client/naming/enumconflict/aio/operations/_operations.py

@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -26,11 +27,10 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 
+from ... import models as _models
 from ..._utils.model_base import SdkJSONEncoder, _deserialize
 from ..._utils.serialization import Deserializer, Serializer
-from ...firstnamespace import models as _firstnamespace_models3
 from ...operations._operations import build_first_operations_first_request, build_second_operations_second_request
-from ...secondnamespace import models as _secondnamespace_models3
 from .._configuration import EnumConflictClientConfiguration
 
 JSON = MutableMapping[str, Any]
@@ -57,24 +57,22 @@ def __init__(self, *args, **kwargs) -> None:
 
     @overload
     async def first(
-        self, body: _firstnamespace_models3.FirstModel, *, content_type: str = "application/json", **kwargs: Any
-    ) -> _firstnamespace_models3.FirstModel:
+        self, body: _models.FirstModel, *, content_type: str = "application/json", **kwargs: Any
+    ) -> _models.FirstModel:
         """Operation using first namespace Status enum.
 
         :param body: Required.
-        :type body: ~client.naming.enumconflict.firstnamespace.models.FirstModel
+        :type body: ~client.naming.enumconflict.models.FirstModel
         :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
          Default value is "application/json".
         :paramtype content_type: str
         :return: FirstModel. The FirstModel is compatible with MutableMapping
-        :rtype: ~client.naming.enumconflict.firstnamespace.models.FirstModel
+        :rtype: ~client.naming.enumconflict.models.FirstModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
     @overload
-    async def first(
-        self, body: JSON, *, content_type: str = "application/json", **kwargs: Any
-    ) -> _firstnamespace_models3.FirstModel:
+    async def first(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> _models.FirstModel:
         """Operation using first namespace Status enum.
 
         :param body: Required.
@@ -83,14 +81,14 @@ async def first(
          Default value is "application/json".
         :paramtype content_type: str
         :return: FirstModel. The FirstModel is compatible with MutableMapping
-        :rtype: ~client.naming.enumconflict.firstnamespace.models.FirstModel
+        :rtype: ~client.naming.enumconflict.models.FirstModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
     @overload
     async def first(
         self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any
-    ) -> _firstnamespace_models3.FirstModel:
+    ) -> _models.FirstModel:
         """Operation using first namespace Status enum.
 
         :param body: Required.
@@ -99,20 +97,18 @@ async def first(
          Default value is "application/json".
         :paramtype content_type: str
         :return: FirstModel. The FirstModel is compatible with MutableMapping
-        :rtype: ~client.naming.enumconflict.firstnamespace.models.FirstModel
+        :rtype: ~client.naming.enumconflict.models.FirstModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
     @distributed_trace_async
-    async def first(
-        self, body: Union[_firstnamespace_models3.FirstModel, JSON, IO[bytes]], **kwargs: Any
-    ) -> _firstnamespace_models3.FirstModel:
+    async def first(self, body: Union[_models.FirstModel, JSON, IO[bytes]], **kwargs: Any) -> _models.FirstModel:
         """Operation using first namespace Status enum.
 
         :param body: Is one of the following types: FirstModel, JSON, IO[bytes] Required.
-        :type body: ~client.naming.enumconflict.firstnamespace.models.FirstModel or JSON or IO[bytes]
+        :type body: ~client.naming.enumconflict.models.FirstModel or JSON or IO[bytes]
         :return: FirstModel. The FirstModel is compatible with MutableMapping
-        :rtype: ~client.naming.enumconflict.firstnamespace.models.FirstModel
+        :rtype: ~client.naming.enumconflict.models.FirstModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
@@ -127,7 +123,7 @@ async def first(
         _params = kwargs.pop("params", {}) or {}
 
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_firstnamespace_models3.FirstModel] = kwargs.pop("cls", None)
+        cls: ClsType[_models.FirstModel] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _content = None
@@ -166,7 +162,7 @@ async def first(
         if _stream:
             deserialized = response.iter_bytes()
         else:
-            deserialized = _deserialize(_firstnamespace_models3.FirstModel, response.json())
+            deserialized = _deserialize(_models.FirstModel, response.json())
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -193,24 +189,22 @@ def __init__(self, *args, **kwargs) -> None:
 
     @overload
     async def second(
-        self, body: _secondnamespace_models3.SecondModel, *, content_type: str = "application/json", **kwargs: Any
-    ) -> _secondnamespace_models3.SecondModel:
+        self, body: _models.SecondModel, *, content_type: str = "application/json", **kwargs: Any
+    ) -> _models.SecondModel:
         """Operation using second namespace Status enum.
 
         :param body: Required.
-        :type body: ~client.naming.enumconflict.secondnamespace.models.SecondModel
+        :type body: ~client.naming.enumconflict.models.SecondModel
         :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
          Default value is "application/json".
         :paramtype content_type: str
         :return: SecondModel. The SecondModel is compatible with MutableMapping
-        :rtype: ~client.naming.enumconflict.secondnamespace.models.SecondModel
+        :rtype: ~client.naming.enumconflict.models.SecondModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
     @overload
-    async def second(
-        self, body: JSON, *, content_type: str = "application/json", **kwargs: Any
-    ) -> _secondnamespace_models3.SecondModel:
+    async def second(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> _models.SecondModel:
         """Operation using second namespace Status enum.
 
         :param body: Required.
@@ -219,14 +213,14 @@ async def second(
          Default value is "application/json".
         :paramtype content_type: str
         :return: SecondModel. The SecondModel is compatible with MutableMapping
-        :rtype: ~client.naming.enumconflict.secondnamespace.models.SecondModel
+        :rtype: ~client.naming.enumconflict.models.SecondModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
     @overload
     async def second(
         self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any
-    ) -> _secondnamespace_models3.SecondModel:
+    ) -> _models.SecondModel:
         """Operation using second namespace Status enum.
 
         :param body: Required.
@@ -235,20 +229,18 @@ async def second(
          Default value is "application/json".
         :paramtype content_type: str
         :return: SecondModel. The SecondModel is compatible with MutableMapping
-        :rtype: ~client.naming.enumconflict.secondnamespace.models.SecondModel
+        :rtype: ~client.naming.enumconflict.models.SecondModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
     @distributed_trace_async
-    async def second(
-        self, body: Union[_secondnamespace_models3.SecondModel, JSON, IO[bytes]], **kwargs: Any
-    ) -> _secondnamespace_models3.SecondModel:
+    async def second(self, body: Union[_models.SecondModel, JSON, IO[bytes]], **kwargs: Any) -> _models.SecondModel:
         """Operation using second namespace Status enum.
 
         :param body: Is one of the following types: SecondModel, JSON, IO[bytes] Required.
-        :type body: ~client.naming.enumconflict.secondnamespace.models.SecondModel or JSON or IO[bytes]
+        :type body: ~client.naming.enumconflict.models.SecondModel or JSON or IO[bytes]
         :return: SecondModel. The SecondModel is compatible with MutableMapping
-        :rtype: ~client.naming.enumconflict.secondnamespace.models.SecondModel
+        :rtype: ~client.naming.enumconflict.models.SecondModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
@@ -263,7 +255,7 @@ async def second(
         _params = kwargs.pop("params", {}) or {}
 
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_secondnamespace_models3.SecondModel] = kwargs.pop("cls", None)
+        cls: ClsType[_models.SecondModel] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _content = None
@@ -302,7 +294,7 @@ async def second(
         if _stream:
             deserialized = response.iter_bytes()
         else:
-            deserialized = _deserialize(_secondnamespace_models3.SecondModel, response.json())
+            deserialized = _deserialize(_models.SecondModel, response.json())
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore

packages/typespec-python/test/azure/generated/client-naming-enum-conflict/client/naming/enumconflict/firstnamespace/__init__.py

@@ -14,19 +14,23 @@
 
 
 from ._models import (  # type: ignore
+    FirstModel,
     SecondModel,
 )
 
 from ._enums import (  # type: ignore
     SecondStatus,
+    Status,
 )
 from ._patch import __all__ as _patch_all
 from ._patch import *
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
+    "FirstModel",
     "SecondModel",
     "SecondStatus",
+    "Status",
 ]
 __all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 _patch_sdk()

packages/typespec-python/test/azure/generated/client-naming-enum-conflict/client/naming/enumconflict/firstnamespace/models/_enums.py

@@ -17,3 +17,12 @@ class SecondStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """Running status"""
     STOPPED = "stopped"
     """Stopped status"""
+
+
+class Status(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Status enum in first namespace."""
+
+    ACTIVE = "active"
+    """Active status"""
+    INACTIVE = "inactive"
+    """Inactive status"""

packages/typespec-python/test/azure/generated/client-naming-enum-conflict/client/naming/enumconflict/firstnamespace/models/_models.py

@@ -9,18 +9,51 @@
 
 from typing import Any, Mapping, TYPE_CHECKING, Union, overload
 
-from ..._utils.model_base import Model as _Model, rest_field
+from .._utils.model_base import Model as _Model, rest_field
 
 if TYPE_CHECKING:
     from .. import models as _models
 
 
+class FirstModel(_Model):
+    """FirstModel.
+
+    :ivar status: Status from first namespace. Required. Known values are: "active" and "inactive".
+    :vartype status: str or ~client.naming.enumconflict.models.Status
+    :ivar name: Name of the item. Required.
+    :vartype name: str
+    """
+
+    status: Union[str, "_models.Status"] = rest_field(visibility=["read", "create", "update", "delete", "query"])
+    """Status from first namespace. Required. Known values are: \"active\" and \"inactive\"."""
+    name: str = rest_field(visibility=["read", "create", "update", "delete", "query"])
+    """Name of the item. Required."""
+
+    @overload
+    def __init__(
+        self,
+        *,
+        status: Union[str, "_models.Status"],
+        name: str,
+    ) -> None: ...
+
+    @overload
+    def __init__(self, mapping: Mapping[str, Any]) -> None:
+        """
+        :param mapping: raw JSON to initialize the model.
+        :type mapping: Mapping[str, Any]
+        """
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+
+
 class SecondModel(_Model):
     """SecondModel.
 
     :ivar status: Status from second namespace. Required. Known values are: "running" and
      "stopped".
-    :vartype status: str or ~client.naming.enumconflict.secondnamespace.models.SecondStatus
+    :vartype status: str or ~client.naming.enumconflict.models.SecondStatus
     :ivar description: Description of the item. Required.
     :vartype description: str
     """