refactor

smithy-lang · Oct 13, 2023 · cb619a8 · cb619a8
1 parent f9f5b5a
commit cb619a8
Show file tree

Hide file tree

Showing 40 changed files with 49 additions and 88 deletions.
diff --git a/TestModels/Aggregate/Makefile b/TestModels/Aggregate/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.aggregate
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_aggregate
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/Aggregate/runtimes/python/pyproject.toml b/TestModels/Aggregate/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-aggregate-test-internaldafny = { path = "test/internaldafny", develop = f
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_aggregate"
diff --git a/TestModels/Constraints/Makefile b/TestModels/Constraints/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.constraints
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_constraints
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/Constraints/runtimes/python/pyproject.toml b/TestModels/Constraints/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-constraints-test-internaldafny = { path = "test/internaldafny", develop =
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_constraints"
diff --git a/TestModels/Constructor/Makefile b/TestModels/Constructor/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.constructor
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_constructor
 
 # This project has no dependencies
 # DEPENDENT-MODELS:=

diff --git a/TestModels/Constructor/runtimes/python/pyproject.toml b/TestModels/Constructor/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-constructor-test-internaldafny = { path = "test/internaldafny", develop =
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_constructor"
diff --git a/TestModels/Dependencies/Makefile b/TestModels/Dependencies/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.dependencies
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_dependencies
 
 # This project takes dependencies on:
 # - SimpleResource

diff --git a/TestModels/Dependencies/runtimes/python/pyproject.toml b/TestModels/Dependencies/runtimes/python/pyproject.toml
@@ -28,7 +28,3 @@ simple-dependencies-test-internaldafny = { path = "test/internaldafny", develop
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_dependencies"
diff --git a/TestModels/Errors/Makefile b/TestModels/Errors/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.errors
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_errors
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/Errors/runtimes/python/pyproject.toml b/TestModels/Errors/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-errors-test-internaldafny = { path = "test/internaldafny", develop = fals
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_errors"
diff --git a/TestModels/Extendable/Makefile b/TestModels/Extendable/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.extendable.resources
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_extendable_resources
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/Extendable/runtimes/python/pyproject.toml b/TestModels/Extendable/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-extendable-resources-test-internaldafny = { path = "test/internaldafny",
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_extendable_resources"
diff --git a/TestModels/Extern/Makefile b/TestModels/Extern/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.dafnyExtern
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_dafnyextern
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/Extern/runtimes/python/pyproject.toml b/TestModels/Extern/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-extern-test-internaldafny = { path = "test/internaldafny", develop = fals
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_dafnyextern"
diff --git a/TestModels/LocalService/Makefile b/TestModels/LocalService/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.localService
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_localservice
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/LocalService/runtimes/python/pyproject.toml b/TestModels/LocalService/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-localservice-test-internaldafny = { path = "test/internaldafny", develop
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_localservice"
diff --git a/TestModels/Refinement/Makefile b/TestModels/Refinement/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.refinement
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_refinement
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/Refinement/runtimes/python/pyproject.toml b/TestModels/Refinement/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-refinement-test-internaldafny = { path = "test/internaldafny", develop =
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_refinement"
diff --git a/TestModels/Resource/Makefile b/TestModels/Resource/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.resources
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_resources
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/Resource/runtimes/python/pyproject.toml b/TestModels/Resource/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-resources-test-internaldafny = { path = "test/internaldafny", develop = f
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_resources"
diff --git a/TestModels/SharedMakefile.mk b/TestModels/SharedMakefile.mk
@@ -54,9 +54,9 @@ CODEGEN_CLI_ROOT := $(PROJECT_ROOT)/../codegen/smithy-dafny-codegen-cli
 GRADLEW := $(PROJECT_ROOT)/../codegen/gradlew
 
 # Returns the name of the Python module as stored in the project's build configuration file (pyproject.toml).
-define GetPythonModuleName
-$(shell grep -m 1 polymorph_package_name runtimes/python/pyproject.toml | tr -s ' ' | tr -d '"' | tr -d "'" | cut -d' ' -f3)
-endef
+#define GetPythonModuleName
+#$(shell grep -m 1 polymorph_package_name runtimes/python/pyproject.toml | tr -s ' ' | tr -d '"' | tr -d "'" | cut -d' ' -f3)
+#endef
 
 ########################## Dafny targets
 
@@ -189,7 +189,6 @@ _polymorph:
  --dependent-model $(PROJECT_ROOT)/dafny-dependencies/Model \
  $(patsubst %, --dependent-model $(PROJECT_ROOT)/%/Model, $(LIBRARIES)) \
  --namespace $(NAMESPACE) \
- $(SMITHY_BUILD) \
  $(AWS_SDK_CMD)";
 
 # If the target language of _polymorph_wrapped includes Python,
@@ -208,7 +207,6 @@ _polymorph_wrapped:
  $(patsubst %, --dependent-model $(PROJECT_ROOT)/%/Model, $(LIBRARIES)) \
  --namespace $(NAMESPACE) \
  $(OUTPUT_LOCAL_SERVICE) \
- $(SMITHY_BUILD) \
  $(AWS_SDK_CMD)";
 
 _polymorph_dependencies:
@@ -257,14 +255,13 @@ polymorph_java: _polymorph_dependencies
 # For python, _polymorph_wrapped includes _polymorph (i.e. local service generation AND wrapped test)
 # To generate only the local service, use the `_polymorph` target
 # There is not a good way to generate only the wrapped test without the local service...
-polymorph_python: SMITHY_BUILD=--smithy-build $(LIBRARY_ROOT)/smithy-build.json
 polymorph_python: OUTPUT_PYTHON_WRAPPED=--output-python $(LIBRARY_ROOT)/runtimes/python/smithygenerated
 polymorph_python: OUTPUT_LOCAL_SERVICE=--local-service-test
 polymorph_python: _polymorph_wrapped
 polymorph_python:
- rm -rf runtimes/python/src/$(call GetPythonModuleName)/smithygenerated
- mkdir runtimes/python/src/$(call GetPythonModuleName)/smithygenerated
- mv runtimes/python/smithygenerated/$(call GetPythonModuleName)/* runtimes/python/src/$(call GetPythonModuleName)/smithygenerated
+ rm -rf runtimes/python/src/$(PYTHON_MODULE_NAME)/smithygenerated
+ mkdir runtimes/python/src/$(PYTHON_MODULE_NAME)/smithygenerated
+ mv runtimes/python/smithygenerated/$(PYTHON_MODULE_NAME)/* runtimes/python/src/$(PYTHON_MODULE_NAME)/smithygenerated
  rm -rf runtimes/python/smithygenerated
 polymorph_python: POLYMORPH_LANGUAGE_TARGET=python
 polymorph_python: _polymorph_dependencies
@@ -406,9 +403,9 @@ _python_revert_underscore_dependency_extern_names:
 # Move Dafny-generated code into its expected location in the Python module
 _mv_internaldafny_python:
  # Remove any previously generated Dafny code in src/, then copy in newly-generated code
- rm -rf runtimes/python/src/$(call GetPythonModuleName)/internaldafny/generated/
- mkdir runtimes/python/src/$(call GetPythonModuleName)/internaldafny/generated/
- mv runtimes/python/dafny_src-py/*.py runtimes/python/src/$(call GetPythonModuleName)/internaldafny/generated
+ rm -rf runtimes/python/src/$(PYTHON_MODULE_NAME)/internaldafny/generated/
+ mkdir runtimes/python/src/$(PYTHON_MODULE_NAME)/internaldafny/generated/
+ mv runtimes/python/dafny_src-py/*.py runtimes/python/src/$(PYTHON_MODULE_NAME)/internaldafny/generated
  rm -rf runtimes/python/dafny_src-py
  # Remove any previously generated Dafny code in test/, then copy in newly-generated code
  rm -rf runtimes/python/test/internaldafny/generated
@@ -439,7 +436,7 @@ _remove_src_module_python:
  # The test/ file contains code to execute tests. The src/ file is largely empty.
  # If the src/ file is installed most recently, tests will fail to run.
  # By removing the src/ file, we ensure the test/ file is always the installed file.
- rm runtimes/python/src/$(call GetPythonModuleName)/internaldafny/generated/module_.py
+ rm runtimes/python/src/$(PYTHON_MODULE_NAME)/internaldafny/generated/module_.py
 
 transpile_dependencies_python: LANG=python
 transpile_dependencies_python: transpile_dependencies

diff --git a/TestModels/SimpleTypes/SimpleBlob/Makefile b/TestModels/SimpleTypes/SimpleBlob/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.blob
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_blob
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/SimpleTypes/SimpleBlob/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleBlob/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-blob-test-internaldafny = { path = "test/internaldafny", develop = false}
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_types_blob"
diff --git a/TestModels/SimpleTypes/SimpleBoolean/Makefile b/TestModels/SimpleTypes/SimpleBoolean/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.boolean
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_boolean
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/SimpleTypes/SimpleBoolean/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleBoolean/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-boolean-test-internaldafny = { path = "test/internaldafny", develop = fal
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_types_boolean"
diff --git a/TestModels/SimpleTypes/SimpleDouble/Makefile b/TestModels/SimpleTypes/SimpleDouble/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.smithyDouble
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_types_smithydouble
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/SimpleTypes/SimpleDouble/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleDouble/runtimes/python/pyproject.toml
@@ -25,6 +25,3 @@ simple-double-test-internaldafny = { path = "test/internaldafny", develop = fals
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_types_smithydouble"
diff --git a/TestModels/SimpleTypes/SimpleEnum/Makefile b/TestModels/SimpleTypes/SimpleEnum/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.smithyEnum
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_types_smithyenum
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/SimpleTypes/SimpleEnum/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleEnum/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-enum-test-internaldafny = { path = "test/internaldafny", develop = false}
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_types_smithyenum"
diff --git a/TestModels/SimpleTypes/SimpleInteger/Makefile b/TestModels/SimpleTypes/SimpleInteger/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.integer
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_types_integer
 
 # This project has no dependencies
 # DEPENDENT-MODELS:=

diff --git a/TestModels/SimpleTypes/SimpleInteger/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleInteger/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-integer-test-internaldafny = { path = "test/internaldafny", develop = fal
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_types_integer"
diff --git a/TestModels/SimpleTypes/SimpleLong/Makefile b/TestModels/SimpleTypes/SimpleLong/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.smithyLong
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_types_smithylong
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/SimpleTypes/SimpleLong/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleLong/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-long-test-internaldafny = { path = "test/internaldafny", develop = false}
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_types_smithylong"
diff --git a/TestModels/SimpleTypes/SimpleString/Makefile b/TestModels/SimpleTypes/SimpleString/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.smithyString
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_types_smithystring
 
 # This project has no dependencies 
 # DEPENDENT-MODELS:= 

diff --git a/TestModels/SimpleTypes/SimpleString/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleString/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-string-test-internaldafny = { path = "test/internaldafny", develop = fals
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_types_smithystring"
diff --git a/TestModels/Union/Makefile b/TestModels/Union/Makefile
@@ -6,6 +6,8 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.union
+# TODO: Move to smithy-build.json once language-specific config is supported
+PYTHON_MODULE_NAME=simple_union
 
 # This project has no dependencies
 # DEPENDENT-MODELS:=

diff --git a/TestModels/Union/runtimes/python/pyproject.toml b/TestModels/Union/runtimes/python/pyproject.toml
@@ -24,7 +24,3 @@ simple-union-test-internaldafny = { path = "test/internaldafny", develop = false
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
-
-[aws.polymorph.config]
-# The string below defines where Polymorph will move code.
-polymorph_package_name = "simple_union"
diff --git a/TestModels/dafny-dependencies/StandardLibrary/Makefile b/TestModels/dafny-dependencies/StandardLibrary/Makefile
@@ -6,6 +6,7 @@ CORES=2
 include ../../SharedMakefile.mk
 
 MAX_RESOURCE_COUNT=500000000
+PYTHON_MODULE_NAME=standard_library
 LIBRARIES :=
 
 # define standard colors