mal-toolbox 1.1.2__tar.gz → 1.1.3__tar.gz

{mal_toolbox-1.1.2/mal_toolbox.egg-info → mal_toolbox-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.1.2
+Version: 1.1.3
 Summary: A collection of tools used to create MAL models and attack graphs.
 Author-email: Andrei Buhaiu <buhaiu@kth.se>, Joakim Loxdal <loxdal@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Giuseppe Nebbione <nebbione@kth.se>, Sandor Berglund <sandor@kth.se>
 License: Apache Software License

{mal_toolbox-1.1.2 → mal_toolbox-1.1.3/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.1.2
+Version: 1.1.3
 Summary: A collection of tools used to create MAL models and attack graphs.
 Author-email: Andrei Buhaiu <buhaiu@kth.se>, Joakim Loxdal <loxdal@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Giuseppe Nebbione <nebbione@kth.se>, Sandor Berglund <sandor@kth.se>
 License: Apache Software License

{mal_toolbox-1.1.2 → mal_toolbox-1.1.3}/maltoolbox/__init__.py

@@ -1,4 +1,4 @@
-# MAL Toolbox v1.1.2
+# MAL Toolbox v1.1.3
 # Copyright 2025, Andrei Buhaiu.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 """
 
 __title__ = "maltoolbox"
-__version__ = "1.1.2"
+__version__ = "1.1.3"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",

{mal_toolbox-1.1.2 → mal_toolbox-1.1.3}/maltoolbox/language/languagegraph.py

@@ -80,7 +80,7 @@ class LanguageGraphAsset:
         field(default_factory=dict)
     info: dict = field(default_factory=dict)
     own_super_asset: LanguageGraphAsset | None = None
-    own_sub_assets: set[LanguageGraphAsset] = field(default_factory=set)
+    own_sub_assets: list[LanguageGraphAsset] = field(default_factory=list)
     own_variables: dict = field(default_factory=dict)
     is_abstract: bool | None = None
 
@@ -115,7 +115,7 @@ class LanguageGraphAsset:
         return f'LanguageGraphAsset(name: "{self.name}")'
 
     def __hash__(self):
-        return hash(self.name)
+        return id(self)
 
     def is_subasset_of(self, target_asset: LanguageGraphAsset) -> bool:
         """Check if an asset extends the target asset through inheritance.
@@ -383,7 +383,7 @@ class LanguageGraphAttackStep:
     detectors: dict = field(default_factory=dict)
 
     def __hash__(self):
-        return hash(self.full_name)
+        return id(self)
 
     @property
     def children(self) -> dict[
@@ -773,7 +773,7 @@ class LanguageGraph:
                 attack_steps={},
                 info=asset['info'],
                 own_super_asset=None,
-                own_sub_assets=set(),
+                own_sub_assets=list(),
                 own_variables={},
                 is_abstract=asset['is_abstract']
             )
@@ -788,7 +788,8 @@ class LanguageGraph:
                     msg = f'Super asset "{super_name}" for "{asset["name"]}" not found'
                     logger.error(msg)
                     raise LanguageGraphSuperAssetNotFoundError(msg)
-                super_asset.own_sub_assets.add(asset_node)
+
+                super_asset.own_sub_assets.append(asset_node)
                 asset_node.own_super_asset = super_asset
 
         # Associations
@@ -1454,7 +1455,7 @@ class LanguageGraph:
                     raise LanguageGraphSuperAssetNotFoundError(
                         msg % (asset_dict["superAsset"], asset_dict["name"]))
 
-                super_asset.own_sub_assets.add(asset)
+                super_asset.own_sub_assets.append(asset)
                 asset.own_super_asset = super_asset
 
     def _set_variables_for_assets(
@@ -1625,7 +1626,7 @@ class LanguageGraph:
                 attack_steps={},
                 info=asset_dict['meta'],
                 own_super_asset=None,
-                own_sub_assets=set(),
+                own_sub_assets=list(),
                 own_variables={},
                 is_abstract=asset_dict['isAbstract']
             )
@@ -1781,11 +1782,3 @@ class LanguageGraph:
         """
         self.assets = {}
         self._generate_graph()
-
-    def __getstate__(self):
-        return self._to_dict()
-
-    def __setstate__(self, state):
-        temp_lang_graph = self._from_dict(state)
-        self.assets = temp_lang_graph.assets
-        self.metadata = temp_lang_graph.metadata

{mal_toolbox-1.1.2 → mal_toolbox-1.1.3}/maltoolbox/model.py

@@ -310,27 +310,6 @@ class Model:
                 "Try to upgrade it with 'maltoolbox upgrade-model'"
             ) from e
 
-    def __getstate__(self):
-        lang_state = self.lang_graph.__getstate__()
-        state = self._to_dict()
-        return {
-            'model_state': state,
-            'lang_graph': lang_state
-        }
-    
-    def __setstate__(self, state):
-        # Restore the language graph first
-        lang_graph = LanguageGraph.__new__(LanguageGraph)
-        lang_graph.__setstate__(state['lang_graph'])
-        self.lang_graph = lang_graph
-        
-        # Restore the model state by creating a temporary model and copying attributes
-        temp_model = self._from_dict(state['model_state'], self.lang_graph)
-        self.name = temp_model.name
-        self.assets = temp_model.assets
-        self._name_to_asset = temp_model._name_to_asset
-        self.maltoolbox_version = temp_model.maltoolbox_version
-        self.next_id = temp_model.next_id
 
 class ModelAsset:
     def __init__(

{mal_toolbox-1.1.2 → mal_toolbox-1.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mal-toolbox"
-version = "1.1.2"
+version = "1.1.3"
 authors = [
   { name="Andrei Buhaiu", email="buhaiu@kth.se" },
   { name="Joakim Loxdal", email="loxdal@kth.se" },