basic generaiton possible from autorest with script files moved to pygen

Azure · May 13, 2024 · 93ea493 · 93ea493
1 parent c0367d4
commit 93ea493
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 15 deletions.
diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json
@@ -4,7 +4,7 @@
   "description": "The Python extension for generators in AutoRest.",
   "scripts": {
     "prepare": "node ./node_modules/@azure-tools/python-client-generator-core/run-python3.js ./node_modules/@azure-tools/python-client-generator-core/prepare.py",
-    "start": "node ./node_modules/@azure-tools/python-client-generator-core/run-python3.js ./node_modules/@azure-tools/python-client-generator-core/start.py",
+    "start": "node ./node_modules/@azure-tools/python-client-generator-core/run-python3.js start.py",
     "install": "node ./node_modules/@azure-tools/python-client-generator-core/run-python3.js ./node_modules/@azure-tools/python-client-generator-core/install.py",
     "debug": "node r./node_modules/@azure-tools/python-client-generator-core/un-python3.js ./node_modules/@azure-tools/python-client-generator-core/start.py --debug"
   },

diff --git a/packages/pygen/start.py → packages/autorest.python/start.py b/packages/pygen/start.py → packages/autorest.python/start.py
@@ -13,7 +13,7 @@
 from pathlib import Path
 import venv
 
-from venvtools import python_run
+from pygen.utils.venvtools import python_run
 
 _ROOT_DIR = Path(__file__).parent
 

diff --git a/packages/pygen/install.py b/packages/pygen/install.py
@@ -26,7 +26,7 @@
 import subprocess
 from pathlib import Path
 
-from venvtools import ExtendedEnvBuilder, python_run
+from pygen.utils.venvtools import ExtendedEnvBuilder, python_run
 
 _ROOT_DIR = Path(__file__).parent
 

diff --git a/packages/pygen/package.json b/packages/pygen/package.json
@@ -35,7 +35,6 @@
     "setup.py",
     "install.py",
     "prepare.py",
-    "start.py",
     "venvtools.py",
     "run-python3.js",
     "requirements.txt",

diff --git a/packages/pygen/prepare.py b/packages/pygen/prepare.py
@@ -13,7 +13,7 @@
 from pathlib import Path
 import venv
 
-from venvtools import python_run
+from pygen.utils.venvtools import python_run
 
 _ROOT_DIR = Path(__file__).parent
 

diff --git a/packages/pygen/pygen/black/__init__.py b/packages/pygen/pygen/black/__init__.py
@@ -11,7 +11,7 @@
 from black.report import NothingChanged
 
 from .. import Plugin
-from .._utils import parse_args
+from ..utils import parse_args
 
 _LOGGER = logging.getLogger("blib2to3")
 

diff --git a/packages/pygen/pygen/codegen/__init__.py b/packages/pygen/pygen/codegen/__init__.py
@@ -10,7 +10,7 @@
 
 
 from .. import Plugin
-from .._utils import parse_args
+from ..utils import parse_args
 from .models.code_model import CodeModel
 from .serializers import JinjaSerializer
 from ._utils import DEFAULT_HEADER_TEXT, VALID_PACKAGE_MODE, TYPESPEC_PACKAGE_MODE

diff --git a/packages/pygen/pygen/codegen/serializers/__init__.py b/packages/pygen/pygen/codegen/serializers/__init__.py
@@ -28,7 +28,7 @@
 from .sample_serializer import SampleSerializer
 from .test_serializer import TestSerializer, TestGeneralSerializer
 from .types_serializer import TypesSerializer
-from ..._utils import to_snake_case
+from ...utils import to_snake_case
 from .._utils import VALID_PACKAGE_MODE
 from .utils import (
     extract_sample_name,

diff --git a/packages/pygen/pygen/codegen/serializers/builder_serializer.py b/packages/pygen/pygen/codegen/serializers/builder_serializer.py
@@ -36,7 +36,7 @@
 from .parameter_serializer import ParameterSerializer, PopKwargType
 from ..models.parameter_list import ParameterType
 from . import utils
-from ..._utils import JSON_REGEXP
+from ...utils import JSON_REGEXP
 
 T = TypeVar("T")
 OrderedSet = Dict[T, None]

diff --git a/packages/pygen/pygen/codegen/serializers/client_serializer.py b/packages/pygen/pygen/codegen/serializers/client_serializer.py
@@ -8,7 +8,7 @@
 from . import utils
 from ..models import Client, ParameterMethodLocation
 from .parameter_serializer import ParameterSerializer, PopKwargType
-from ..._utils import build_policies
+from ...utils import build_policies
 
 
 class ClientSerializer:

diff --git a/packages/pygen/pygen/codegen/serializers/sample_serializer.py b/packages/pygen/pygen/codegen/serializers/sample_serializer.py
@@ -22,7 +22,7 @@
     FileImport,
 )
 from .utils import get_namespace_config, get_namespace_from_package_name
-from ..._utils import to_snake_case
+from ...utils import to_snake_case
 
 _LOGGER = logging.getLogger(__name__)
 

diff --git a/packages/pygen/pygen/m2r/__init__.py b/packages/pygen/pygen/m2r/__init__.py
@@ -11,7 +11,7 @@
 import m2r2
 
 from .. import YamlUpdatePlugin
-from .._utils import parse_args
+from ..utils import parse_args
 
 
 _LOGGER = logging.getLogger(__name__)

diff --git a/packages/pygen/pygen/preprocess/__init__.py b/packages/pygen/pygen/preprocess/__init__.py
@@ -8,7 +8,7 @@
 import copy
 from typing import Callable, Dict, Any, List, Optional
 
-from .._utils import to_snake_case
+from ..utils import to_snake_case
 from .helpers import (
     add_redefined_builtin_info,
     pad_builtin_namespaces,
@@ -17,7 +17,7 @@
 from .python_mappings import CADL_RESERVED_WORDS, RESERVED_WORDS, PadType
 
 from .. import YamlUpdatePlugin
-from .._utils import parse_args, get_body_type_for_description, JSON_REGEXP, KNOWN_TYPES
+from ..utils import parse_args, get_body_type_for_description, JSON_REGEXP, KNOWN_TYPES
 
 
 def update_overload_section(

diff --git a/packages/pygen/pygen/_utils.py → packages/pygen/pygen/utils/__init__.py b/packages/pygen/pygen/_utils.py → packages/pygen/pygen/utils/__init__.py
diff --git a/packages/pygen/venvtools.py → packages/pygen/pygen/utils/venvtools.py b/packages/pygen/venvtools.py → packages/pygen/pygen/utils/venvtools.py
diff --git a/packages/pygen/run_tsp.py b/packages/pygen/run_tsp.py
@@ -7,7 +7,7 @@
 import venv
 import logging
 from pathlib import Path
-from venvtools import python_run
+from pygen.utils.venvtools import python_run
 
 _ROOT_DIR = Path(__file__).parent