amsdal_cli 0.4.14__py3-none-any.whl → 0.4.16__py3-none-any.whl

amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md

@@ -1185,4 +1185,39 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.
+
+## click **v8**
+
+### [https://github.com/pallets/click/](https://github.com/pallets/click/)
+
+### **BSD-3-Clause license**
+
+Copyright 2014 Pallets
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1.  Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+2.  Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+3.  Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

amsdal_cli/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present
 #
 # SPDX-License-Identifier: AMSDAL End User License Agreement
-__version__ = '0.4.14'
+__version__ = '0.4.16'

amsdal_cli/commands/generate/sub_commands/generate_tests.py

@@ -16,9 +16,9 @@ from amsdal_cli.commands.generate.enums import TestType
 def generate_tests(
     ctx: typer.Context,
     model_name: str = typer.Option(..., help='The model name. It should be provided in PascalCase.'),
-    test_type: TestType = typer.Option(TestType.UNIT, help='The type of test to generate.'),  # noqa: B008
+    test_type: TestType = typer.Option(TestType.UNIT.value, help='The type of test to generate.'),  # noqa: B008
     test_data_type: TestDataType = typer.Option(  # noqa: B008
-        TestDataType.DYNAMIC,
+        TestDataType.DYNAMIC.value,
         help='The type of test data to generate.',
     ),
     config: Annotated[Path, typer.Option(..., '--config', '-c')] = None,  # type: ignore # noqa: RUF013

amsdal_cli/commands/generate/utils/tests/model_utils.py

@@ -108,7 +108,11 @@ def object_init_call(
 ) -> ast.Call:
     from amsdal_cli.commands.generate.utils.tests.type_utils import keywords_for_schema
 
-    imports_set.add((f'models.{model_name_snake_case}', object_schema.title))
+    if cli_config.models_format == ModelsFormat.PY:
+        model_class = find_model_class('models', object_schema.title)
+        imports_set.add((model_class.__module__, object_schema.title))
+    else:
+        imports_set.add((f'models.{model_name_snake_case}', object_schema.title))
 
     return ast.Call(
         func=ast.Name(id=object_schema.title, ctx=ast.Load()),

amsdal_cli/commands/migrations/sub_commands/apply.py

@@ -211,7 +211,7 @@ def apply_migrations(
     ] = None,  # type: ignore[assignment]
     build_dir: Annotated[Path, typer.Option(..., '--build-dir', '-b')] = Path('.'),
     *,
-    module_type: Annotated[ModuleType, typer.Option(..., '--module', '-m')] = ModuleType.USER,
+    module_type: Annotated[ModuleType, typer.Option(..., '--module', '-m')] = ModuleType.USER.value,  # type: ignore
     fake: Annotated[bool, typer.Option('--fake', '-f')] = False,
     config: Annotated[Path, typer.Option(..., '--config', '-c')] = None,  # type: ignore # noqa: RUF013
 ) -> None:

amsdal_cli/commands/migrations/sub_commands/make.py

@@ -122,7 +122,7 @@ def make_migrations(
     build_dir: Annotated[Path, typer.Option('--build-dir', '-b')] = Path('.'),
     *,
     name: Annotated[str, typer.Option('--name', '-n', help='Migration name')] = None,  # type: ignore # noqa: RUF013
-    is_data: Annotated[bool, typer.Option('--data', '-d', is_flag=True, help='Create data migration')] = False,
+    is_data: Annotated[bool, typer.Option('--data', '-d', help='Create data migration')] = False,
     config: Annotated[Path, typer.Option('--config', '-c')] = None,  # type: ignore # noqa: RUF013
 ) -> None:
     """

amsdal_cli/commands/restore/command.py

@@ -264,6 +264,8 @@ async def _async_restore_models(app_source_path: Path, cli_config: 'CliConfig')
 
 def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None:
     from amsdal_data.connections.constants import SECONDARY_PARTITION_KEY
+    from amsdal_data.connections.historical.data_query_transform import META_FOREIGN_KEYS
+    from amsdal_data.connections.historical.data_query_transform import META_PRIMARY_KEY_FIELDS
     from amsdal_data.utils import object_schema_to_glue_schema
     from amsdal_utils.config.manager import AmsdalConfigManager
 
@@ -277,6 +279,12 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
 
     class_object_ref, class_object_meta_ref = _get_class_object_reference(lakehouse_connection)
     model_pks, model_fks, model_m2ms = _fetch_model_pks_and_fks(lakehouse_connection, class_object_ref)
+
+    expected_m2m_tables: set[str] = set()
+    for model_name, m2m_list in model_m2ms.items():
+        for _, m2m_value in m2m_list.items():
+            expected_m2m_tables.add(f'{model_name}{m2m_value[1]}')
+
     user_schemas = _get_user_schemas(
         lakehouse_connection,
         class_object_ref,
@@ -287,7 +295,8 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
     user_scheams_with_tries = [(table_ref, schema, 0) for table_ref, schema in user_schemas]
     refs_by_name = {table_ref.name: table_ref for table_ref, _ in user_schemas}
 
-    m2m_all_data = []
+    m2m_schemas = [schema for schema in user_schemas if schema[0].name in expected_m2m_tables]
+
     while user_scheams_with_tries:
         table_ref, schema, current_iteration = user_scheams_with_tries.pop(0)
         rprint(rich_info(f'Restoring {table_ref.name}'))
@@ -316,7 +325,7 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
 
             from amsdal_data.connections.historical.data_query_transform import META_CLASS_NAME
 
-            data, m2m_data = _build_data(
+            data, _ = _build_data(
                 item,
                 model_name=table_ref.metadata[META_CLASS_NAME],  # type: ignore[index]
                 model_pks=model_pks,
@@ -325,7 +334,6 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
                 refs_by_name=refs_by_name,
             )
 
-            m2m_all_data.extend(m2m_data)
             state_connection.run_mutations(
                 mutations=[
                     glue.InsertData(
@@ -339,12 +347,79 @@ def _restore_state_db(cli_config: 'CliConfig', config_path: Path | None) -> None
                 ],
             )
             rprint('.', end='')
+
     rprint('Inserting m2m data...')
+    m2m_all_data = []
+    for schema_ref, schema in m2m_schemas:
+        _datas = []
+        _objects = lakehouse_connection.query(glue.QueryStatement(table=schema_ref))
+        field1, field2 = schema.required
+        prop1 = schema.properties[field1]  # type: ignore[index]
+        prop2 = schema.properties[field2]  # type: ignore[index]
+
+        rprint(rich_info(f'Found {len(_objects)} m2m objects for {schema_ref.name}...'))
+        for _item in _objects:
+            obj_id_1 = _item.data[field1]['ref']['object_id']
+            obj_id_2 = _item.data[field2]['ref']['object_id']
+            _datas.append(
+                glue.Data(
+                    data={
+                        f'{field1}_partition_key': obj_id_1,
+                        f'{field2}_partition_key': obj_id_2,
+                    },
+                    metadata={
+                        META_PRIMARY_KEY_FIELDS: {
+                            f'{field1}_partition_key': str,
+                            f'{field2}_partition_key': str,
+                        },
+                        META_FOREIGN_KEYS: {
+                            f'{field1}_partition_key': {
+                                'ref': {
+                                    'resource': 'statedb',
+                                    'class_name': prop1.type,
+                                    'object_id': obj_id_1,
+                                    'class_version': 'LATEST',
+                                    'object_version': 'LATEST',
+                                },
+                            },
+                            f'{field2}_partition_key': {
+                                'ref': {
+                                    'resource': 'statedb',
+                                    'class_name': prop2.type,
+                                    'object_id': obj_id_2,
+                                    'class_version': 'LATEST',
+                                    'object_version': 'LATEST',
+                                },
+                            },
+                        },
+                    },
+                )
+            )
+
+        if _datas:
+            m2m_all_data.append(
+                glue.InsertData(
+                    schema=glue.SchemaReference(
+                        name=schema_ref.name,
+                        version=glue.Version.LATEST,
+                        metadata=schema_ref.metadata,
+                    ),
+                    data=_datas,
+                )
+            )
     for _m2m_data in m2m_all_data:
-        try:
-            state_connection.run_mutations(mutations=[_m2m_data])
-        except Exception:
-            rprint('Error inserting m2m data')
+        for data in _m2m_data.data:
+            try:
+                state_connection.run_mutations(
+                    mutations=[
+                        glue.InsertData(
+                            schema=_m2m_data.schema,
+                            data=[data],
+                        ),
+                    ]
+                )
+            except Exception:
+                rprint('Error inserting m2m data')
 
     rprint(rich_success('Done! All classes are restored.'))
 

{amsdal_cli-0.4.14.dist-info → amsdal_cli-0.4.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.4.14
+Version: 0.4.16
 Summary: CLI for AMSDAL framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_cli/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_cli/
@@ -122,13 +122,14 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.11
 Requires-Dist: amsdal-server==0.4.*
+Requires-Dist: click<8.2.0
 Requires-Dist: faker==27.*
 Requires-Dist: gitpython~=3.1
 Requires-Dist: jinja2~=3.1
 Requires-Dist: pydantic-settings~=2.2
 Requires-Dist: pydantic~=2.3
-Requires-Dist: rich~=13.9
-Requires-Dist: typer~=0.15.2
+Requires-Dist: rich~=14.0
+Requires-Dist: typer~=0.15.3
 Requires-Dist: watchfiles~=0.21
 Description-Content-Type: text/markdown
 

{amsdal_cli-0.4.14.dist-info → amsdal_cli-0.4.16.dist-info}/RECORD

@@ -1,5 +1,5 @@
-amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=eHOIhsC6pZv3Wf8aKfaBNJhVi20gM6Rm2PakZTrdIOQ,66641
-amsdal_cli/__about__.py,sha256=wXplutfyWxsByTpCqDxH2K23UsxxTLWbEWChA8Fk9CE,125
+amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=uHJlGG0D4tbpUi8cq-497NNO9ltQ67a5448k-T14HTw,68241
+amsdal_cli/__about__.py,sha256=CNkKcTivBzCdpiOZg2Fy-UDtB7Hu79U3tfy8RCNecAQ,125
 amsdal_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/app.py,sha256=_ucuLT5ospf1ifFKEG0IMfVnxKjnvPUQ4iMhkvOfCrc,466
 amsdal_cli/main.py,sha256=LtH-BD1eJrAUecjKzC8Gx7kYFUstOMH1erdeJUVqFB8,144
@@ -108,7 +108,7 @@ amsdal_cli/commands/generate/sub_commands/generate_model.py,sha256=5IgbkMqPHBBHI
 amsdal_cli/commands/generate/sub_commands/generate_modifier.py,sha256=NyN7vMTBGaQv6u815WT1lqAlqI4xP1AmIZWq5edZ-5g,1426
 amsdal_cli/commands/generate/sub_commands/generate_permission.py,sha256=gfRhZsnNnd_m_HxdOCB8C22tbMkopg2FTKo-T68b13s,2824
 amsdal_cli/commands/generate/sub_commands/generate_property.py,sha256=XrCjf48oEzuMPqsTuC5Qsn1WbIQzUVW8BNOmXssfUM8,1599
-amsdal_cli/commands/generate/sub_commands/generate_tests.py,sha256=5AwhsfAFCOnV-R6FTW7cqECJbw36gK5ixEv7N7Do5zM,4606
+amsdal_cli/commands/generate/sub_commands/generate_tests.py,sha256=9n237ZMWzxp9Bq-QooFeynG_jDmjA42EBJkRt4S3AsE,4618
 amsdal_cli/commands/generate/sub_commands/generate_transaction.py,sha256=hBHceRNqqxVVqIBmMkMOcRG5AM_PB3Pc7ABdm5oeytE,1640
 amsdal_cli/commands/generate/templates/async_transaction.pyt,sha256=HDnJpIzSuf5h0lYLXDYv_w4LqjJNEl6FMybeT9A19uI,173
 amsdal_cli/commands/generate/templates/hook.pyt,sha256=nqToFKu6GIxrXWlpg5IN9rK8nkZ07F4sH-aZEQaTfpY,261
@@ -125,7 +125,7 @@ amsdal_cli/commands/generate/utils/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 amsdal_cli/commands/generate/utils/tests/async_mode_utils.py,sha256=iub84Pj5TMa38W90Pr5HgkFQLXpUdbmcm9HOx98Oh6o,309
 amsdal_cli/commands/generate/utils/tests/conftest_utils.py,sha256=8KzHtDh7eQGghhj5aZkY7Mu2rrlkBgM4Khf857iGG1Y,838
 amsdal_cli/commands/generate/utils/tests/function_utils.py,sha256=Bkk9JDbANX2aSreNRr1Bste5rPwVKc2HV5xLFg2dQK4,496
-amsdal_cli/commands/generate/utils/tests/model_utils.py,sha256=EjxZ3AH8ElHndpwkfFa0GUw1cMgYBcHQuzMofusgb7A,3844
+amsdal_cli/commands/generate/utils/tests/model_utils.py,sha256=CBfR9AcL6Q1boEejjmOD16F0kgJFdIjYYWNE3vQMkfE,4051
 amsdal_cli/commands/generate/utils/tests/type_utils.py,sha256=PkPmSvLCKOK5wWw1Q9oVMUZ0nUpHEtj6PlBsO7enmzY,9247
 amsdal_cli/commands/generate/utils/tests/unit.py,sha256=KRqBhk_jy_1vp0RZub7HdYxfhn3Bra2v0heDNNPldeE,27741
 amsdal_cli/commands/generate/utils/tests/templates/async/conftest.py,sha256=9GfoV_HzwuWtglI7uz0fP5_pOsPk2f56elaoinuPa80,1632
@@ -135,9 +135,9 @@ amsdal_cli/commands/migrations/app.py,sha256=0HsKjZ5D2j9xkOi2Fuvs3VdlhWyQnS8XJ6p
 amsdal_cli/commands/migrations/command.py,sha256=jlpdYZAc02ZUBxSdzGSzkDxEb1nlHNzoq05FdRCSzus,206
 amsdal_cli/commands/migrations/constants.py,sha256=846-DQ-Iqcxw2akd5aBAmbnXHDmRFqEKu6vai2ZFBkU,35
 amsdal_cli/commands/migrations/sub_commands/__init__.py,sha256=_rWbDyY3DPdN-6vE60djCtHejvSkl6d1e2Z4ScM52bo,976
-amsdal_cli/commands/migrations/sub_commands/apply.py,sha256=26wMVtzBpJawbFPpiXSUGItmzd1XORymcIBgbonVZgw,9475
+amsdal_cli/commands/migrations/sub_commands/apply.py,sha256=S7gfkxhOfcjfXiBiiwH9dVMVrMmedlwe_SaMBS-YaD4,9497
 amsdal_cli/commands/migrations/sub_commands/list.py,sha256=xOfonot6JAs3ApXe-QRLKfJf2kVsj7TalEMwK3V_uC4,5439
-amsdal_cli/commands/migrations/sub_commands/make.py,sha256=y-SWaGzWx2apuTA57prStSo09VjH7Q9ZNjzEvbVzwo8,6272
+amsdal_cli/commands/migrations/sub_commands/make.py,sha256=fLw4iC5lRxdksxg3yaf-qh0yPBNNlvfrdIZ-xxYG3Lk,6258
 amsdal_cli/commands/new/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/new/command.py,sha256=NDuDZNwreyuHsv4tbE-yrNOJViB8wk35IcKvGKQXPXo,3302
 amsdal_cli/commands/new/templates/.amsdal-cli,sha256=PdXPovcT8AfPhqwDLI_4EWFYAS6e3J5JcsHVityBdF8,304
@@ -160,7 +160,7 @@ amsdal_cli/commands/register_connection/utils/migrate_models.py,sha256=XN7pPE7Ks
 amsdal_cli/commands/register_connection/utils/model_generator.py,sha256=w0vz-i-tMdimcQYmFbtfpOZJF8heTTRIzu1yTdbKBpc,10853
 amsdal_cli/commands/register_connection/utils/tables.py,sha256=FOwbWOpEw485Leoqe8LXCVY5osGKTKlMqWD9oqosapk,474
 amsdal_cli/commands/restore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/restore/command.py,sha256=ya3aHpMLpgF_vMAGSTbBuSHIUwC4FaHhMiwrD6AglTo,32833
+amsdal_cli/commands/restore/command.py,sha256=DZ27U8BXkMsxhiqYfQ64wduC-0UYq7UPcZfYRHgZ8nA,36004
 amsdal_cli/commands/restore/enums.py,sha256=6SiKMRGlSjiLyepfbfQFXGAYqlM6Bkoeko2KscntTUQ,307
 amsdal_cli/commands/serve/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/serve/command.py,sha256=tjm1T0yrA2P6nlk_KDNv6Gih2Dkt5nMIN-_WUrLhn58,6541
@@ -199,8 +199,8 @@ amsdal_cli/utils/vcs/base.py,sha256=jC05ExJZDnyHAsW7_4IDf8gQcYgK4dXq3zNlFIX66T4,
 amsdal_cli/utils/vcs/dummy.py,sha256=Lk8MT-b0YlHHUsiXsq5cvmPwcl4jTYdo8piN5_C8ORA,434
 amsdal_cli/utils/vcs/enums.py,sha256=tYR9LN1IOr8BZFbSeX_vDlhn8fPl4IU-Yakii8lRDYs,69
 amsdal_cli/utils/vcs/git.py,sha256=xHynbZcV6p2D3RFCwu1MGGpV9D7eK-pGUtO8kVexTQM,1269
-amsdal_cli-0.4.14.dist-info/METADATA,sha256=SBk7ErSaRWFtW5SJNvmhag3LuXHPDXv1mw8fG2YnMX0,57050
-amsdal_cli-0.4.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amsdal_cli-0.4.14.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
-amsdal_cli-0.4.14.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
-amsdal_cli-0.4.14.dist-info/RECORD,,
+amsdal_cli-0.4.16.dist-info/METADATA,sha256=TW0S3whObzI_H5FKzypEkSk53wd4IYvTX3jOoPCIs0s,57077
+amsdal_cli-0.4.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+amsdal_cli-0.4.16.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
+amsdal_cli-0.4.16.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
+amsdal_cli-0.4.16.dist-info/RECORD,,