Merge pull request #98 from Exabyte-io/feature/SOF-7781

Feature/sof 7781

Author: VsevolodX

src/py/mat3ra/ade/flavor.py

@@ -18,6 +18,7 @@ class FlavorInput(ExecutionUnitInputIdItemSchemaForPhysicsBasedSimulationEngines
 
     pass
 
+
 class Flavor(FlavorSchema, InMemoryEntitySnakeCase):
     """
     Flavor class representing a flavor of an executable.
@@ -38,4 +39,3 @@ class Flavor(FlavorSchema, InMemoryEntitySnakeCase):
     """
 
     input: List[FlavorInput] = Field(default_factory=list, description="Input templates for this flavor")
-

tests/py/test_application.py

@@ -2,14 +2,6 @@
 from mat3ra.utils import assertion
 
 APPLICATION_DEFAULT_FIELDS = {
-    "shortName": None,
-    "summary": None,
-    "build": None,
-    "hasAdvancedComputeOptions": None,
-    "isLicensed": None,
-    "field_id": None,
-    "slug": None,
-    "systemName": None,
     "schemaVersion": "2022.8.16",
     "isDefault": False,
 }

tests/py/test_context_provider.py

@@ -3,14 +3,7 @@
 from mat3ra.esse.models.context_provider import Name
 from mat3ra.utils import assertion
 
-CONTEXT_PROVIDER_DEFAULT_FIELDS = {
-    "domain": None,
-    "entityName": None,
-    "data": None,
-    "extraData": None,
-    "isEdited": None,
-    "context": None,
-}
+CONTEXT_PROVIDER_DEFAULT_FIELDS = {}
 
 CONTEXT_PROVIDER_MINIMAL_CONFIG = {
     "name": Name.KGridFormDataManager,

tests/py/test_flavor.py

@@ -13,6 +13,7 @@
 
 FLAVOR_MINIMAL_CONFIG = {
     "name": "scf",
+    "executableId": "exe_123",
 }
 
 FLAVOR_FULL_CONFIG = {
@@ -32,12 +33,14 @@
 
 FLAVOR_TO_DICT_CONFIG = {
     "name": "scf",
+    "executableId": "exe_123",
     "executableName": "pw.x",
     "applicationName": "espresso",
 }
 
 FLAVOR_FROM_DICT_CONFIG = {
     "name": "scf",
+    "executableId": "exe_123",
     "executableName": "pw.x",
     "applicationName": "espresso",
     "input": [{"name": "pw_scf.in", "templateName": "pw_scf"}],
@@ -46,9 +49,20 @@
 
 FLAVOR_WITH_EXTRA_FIELDS_CONFIG = {
     "name": "scf",
+    "executableId": "exe_123",
     "custom_field": "custom_value",
 }
 
+EXPECTED_FLAVOR_TO_DICT = {
+    "executableId": "exe_123",
+    "executableName": "pw.x",
+    "applicationName": "espresso",
+    "input": [],
+    "schemaVersion": "2022.8.16",
+    "name": "scf",
+    "isDefault": False,
+}
+
 
 def test_flavor_input_creation():
     config = FLAVOR_INPUT_MINIMAL_CONFIG
@@ -84,8 +98,8 @@ def test_flavor_with_all_fields():
 def test_flavor_to_dict():
     config = FLAVOR_TO_DICT_CONFIG
     flavor = Flavor(**config)
-    expected = {**config}
-    assertion.assert_deep_almost_equal(expected, flavor.model_dump(exclude_unset=True))
+    assertion.assert_deep_almost_equal(EXPECTED_FLAVOR_TO_DICT, flavor.to_dict())
+
 
 
 def test_flavor_from_dict():
@@ -99,4 +113,6 @@ def test_flavor_with_extra_fields():
     config = FLAVOR_WITH_EXTRA_FIELDS_CONFIG
     flavor = Flavor(**config)
     assert flavor.name == "scf"
-    assert not hasattr(flavor, "custom_field")
+    assert hasattr(flavor, "custom_field")
+    assert flavor.custom_field == "custom_value"
+    assert "custom_field" in flavor.to_dict()

tests/py/test_template.py

@@ -4,26 +4,11 @@
 from mat3ra.esse.models.context_provider import Name
 from mat3ra.utils import assertion
 
-CONTEXT_PROVIDER_DEFAULT_FIELDS = {
-    "domain": None,
-    "entityName": None,
-    "data": None,
-    "extraData": None,
-    "isEdited": None,
-    "context": None,
-}
+CONTEXT_PROVIDER_DEFAULT_FIELDS = {}
 
 TEMPLATE_DEFAULT_FIELDS = {
-    "rendered": None,
-    "applicationName": None,
-    "applicationVersion": None,
-    "executableName": None,
     "contextProviders": [],
-    "isManuallyChanged": None,
     "schemaVersion": "2022.8.16",
-    "systemName": None,
-    "slug": None,
-    "field_id": None,
 }
 
 CONFIG_MINIMAL = {