valory-xyz · DavidMinarsch · Dec 19, 2022 · Nov 16, 2022 · Nov 16, 2022 · Nov 16, 2022
diff --git a/aea/configurations/data_types.py b/aea/configurations/data_types.py
@@ -86,6 +86,8 @@ class PackageVersion:
 
     _version: PackageVersionLike
 
+    __slots__ = ("_version",)
+
     def __init__(self, version_like: PackageVersionLike) -> None:
         """
         Initialize a package version.
@@ -114,7 +116,9 @@ def __str__(self) -> str:
 
     def __eq__(self, other: Any) -> bool:
         """Check equality."""
-        return isinstance(other, PackageVersion) and self._version == other._version
+        if not isinstance(other, self.__class__):
+            return NotImplemented  # Delegate comparison to the other instance's __eq__.
+        return all(getattr(self, s) == getattr(other, s) for s in self.__slots__)
 
     def __lt__(self, other: Any) -> bool:
         """Compare with another object."""
@@ -451,13 +455,10 @@ def __repr__(self) -> str:
         return f"<{self}>"
 
     def __eq__(self, other: Any) -> bool:
-        """Compare with another object."""
-        return (
-            isinstance(other, PublicId)
-            and self.author == other.author
-            and self.name == other.name
-            and self.version == other.version
-        )
+        """Check equality."""
+        if not isinstance(other, self.__class__):
+            return NotImplemented  # Delegate comparison to the other instance's __eq__.
+        return all(getattr(self, s) == getattr(other, s) for s in self.__slots__[:-1])
 reverse_reachable_dependencies = reachable_nodes( 
     reverse_dependencies, {package_id.without_hash()} 
 ) 
     def get_item_dependencies_with_reverse_dependencies( 
         self, item: PackageConfiguration, package_id: Optional[PackageId] = None 
     ) -> Dict[PackageId, Set[PackageId]]: 
         """ 
         Get item dependencies. 
         It's recursive and provides all the sub dependencies. 
         :param item: the item package configuration 
         :param package_id: the package id. 
         :return: dict with PackageId: and set of PackageIds that uses this package 
         """ 
         result: defaultdict = defaultdict(set) 
         for dep_package_id in self._get_item_requirements( 
             item, self._ignore_non_vendor 
         ): 
             if package_id is None: 
                 _ = result[dep_package_id.without_hash()]  # init default dict value 
             else: 
                 result[dep_package_id.without_hash()].add(package_id.without_hash()) 
             if not self.is_present_in_agent_config( 
                 dep_package_id.without_hash() 
             ):  # pragma: nocover 
                 continue 
             dep_item = self.get_item_config(dep_package_id) 
             for item_key, deps in self.get_item_dependencies_with_reverse_dependencies( 
                 dep_item, dep_package_id 
             ).items(): 
                 result[item_key.without_hash()] = result[item_key].union(deps) 
         return result 
 def _add_package_type(package_type: PackageType, public_id_str: str) -> PackageId: 
     return PackageId(package_type, PublicId.from_str(public_id_str)) 
 def fetch_package(obj_type: str, public_id: PublicId, cwd: str, dest: str) -> Path: 
     """ 
     Fetch a package (connection/contract/protocol/skill) from Registry. 
     :param obj_type: str type of object you want to fetch: 
         'connection', 'protocol', 'skill' 
     :param public_id: str public ID of object. 
     :param cwd: str path to current working directory. 
     :param dest: destination where to save package. 
     :return: package path 
     """ 
     logger.debug( 
         "Fetching {obj_type} {public_id} from Registry...".format( 
             public_id=public_id, obj_type=obj_type 
         ) 
     ) 
     logger.debug( 
         "Downloading {obj_type} {public_id}...".format( 
             public_id=public_id, obj_type=obj_type 
         ) 
     ) 
     package_meta = get_package_meta(obj_type, public_id) 
     file_url = cast(str, package_meta["file"]) 
     filepath = download_file(file_url, cwd) 
     # next code line is needed because the items are stored in tarball packages as folders 
     dest = os.path.split(dest)[0] 
     logger.debug( 
         "Extracting {obj_type} {public_id}...".format( 
             public_id=public_id, obj_type=obj_type 
         ) 
     ) 
     extract(filepath, dest) 
     logger.debug( 
         "Successfully fetched {obj_type} '{public_id}'.".format( 
             public_id=public_id, obj_type=obj_type 
         ) 
     ) 
     package_path = os.path.join(dest, public_id.name) 
     return Path(package_path) 
 reverse_reachable_dependencies = reachable_nodes( 
     reverse_dependencies, {package_id.without_hash()} 
 ) 
     def get_item_dependencies_with_reverse_dependencies( 
         self, item: PackageConfiguration, package_id: Optional[PackageId] = None 
     ) -> Dict[PackageId, Set[PackageId]]: 
         """ 
         Get item dependencies. 
  
         It's recursive and provides all the sub dependencies. 
  
         :param item: the item package configuration 
         :param package_id: the package id. 
         :return: dict with PackageId: and set of PackageIds that uses this package 
         """ 
         result: defaultdict = defaultdict(set) 
  
         for dep_package_id in self._get_item_requirements( 
             item, self._ignore_non_vendor 
         ): 
             if package_id is None: 
                 _ = result[dep_package_id.without_hash()]  # init default dict value 
             else: 
                 result[dep_package_id.without_hash()].add(package_id.without_hash()) 
  
             if not self.is_present_in_agent_config( 
                 dep_package_id.without_hash() 
             ):  # pragma: nocover 
                 continue 
  
             dep_item = self.get_item_config(dep_package_id) 
             for item_key, deps in self.get_item_dependencies_with_reverse_dependencies( 
                 dep_item, dep_package_id 
             ).items(): 
                 result[item_key.without_hash()] = result[item_key].union(deps) 
  
         return result 
 def _add_package_type(package_type: PackageType, public_id_str: str) -> PackageId: 
     return PackageId(package_type, PublicId.from_str(public_id_str)) 
 def fetch_package(obj_type: str, public_id: PublicId, cwd: str, dest: str) -> Path: 
     """ 
     Fetch a package (connection/contract/protocol/skill) from Registry. 
  
     :param obj_type: str type of object you want to fetch: 
         'connection', 'protocol', 'skill' 
     :param public_id: str public ID of object. 
     :param cwd: str path to current working directory. 
     :param dest: destination where to save package. 
  
     :return: package path 
     """ 
     logger.debug( 
         "Fetching {obj_type} {public_id} from Registry...".format( 
             public_id=public_id, obj_type=obj_type 
         ) 
     ) 
  
     logger.debug( 
         "Downloading {obj_type} {public_id}...".format( 
             public_id=public_id, obj_type=obj_type 
         ) 
     ) 
     package_meta = get_package_meta(obj_type, public_id) 
     file_url = cast(str, package_meta["file"]) 
     filepath = download_file(file_url, cwd) 
  
     # next code line is needed because the items are stored in tarball packages as folders 
     dest = os.path.split(dest)[0] 
     logger.debug( 
         "Extracting {obj_type} {public_id}...".format( 
             public_id=public_id, obj_type=obj_type 
         ) 
     ) 
     extract(filepath, dest) 
     logger.debug( 
         "Successfully fetched {obj_type} '{public_id}'.".format( 
             public_id=public_id, obj_type=obj_type 
         ) 
     ) 
     package_path = os.path.join(dest, public_id.name) 
     return Path(package_path) 
 
     def __lt__(self, other: Any) -> bool:
         """
@@ -647,12 +648,10 @@ def __repr__(self) -> str:
         return f"PackageId{self.__str__()}"
 
     def __eq__(self, other: Any) -> bool:
-        """Compare with another object."""
-        return (
-            isinstance(other, PackageId)
-            and self.package_type == other.package_type
-            and self.public_id == other.public_id
-        )
+        """Check equality."""
+        if not isinstance(other, self.__class__):
+            return NotImplemented  # Delegate comparison to the other instance's __eq__.
+        return all(getattr(self, s) == getattr(other, s) for s in self.__slots__)
 
 __slots__ = ("_package_type", "_public_id") 
 __slots__ = ("_package_type", "_public_id") 
     def __lt__(self, other: Any) -> bool:
         """Compare two public ids."""
@@ -874,15 +873,10 @@ def __str__(self) -> str:
         return f"{self.__class__.__name__}(name='{self.name}', version='{self.version}', index='{self.index}', git='{self.git}', ref='{self.ref}')"
 
     def __eq__(self, other: Any) -> bool:
-        """Compare with another object."""
-        return (
-            isinstance(other, Dependency)
-            and self._name == other._name
-            and self._version == other._version
-            and self._index == other._index
-            and self._git == other._git
-            and self._ref == other._ref
-        )
+        """Check equality."""
+        if not isinstance(other, self.__class__):
+            return NotImplemented  # Delegate comparison to the other instance's __eq__.
+        return all(getattr(self, s) == getattr(other, s) for s in self.__slots__)
 
 __slots__ = ("_name", "_version", "_index", "_git", "_ref") 
 __slots__ = ("_name", "_version", "_index", "_git", "_ref") 
 
 Dependencies = Dict[str, Dependency]

diff --git a/docs/api/configurations/data_types.md b/docs/api/configurations/data_types.md
@@ -521,7 +521,7 @@ Get the representation.
 def __eq__(other: Any) -> bool
 ```
 
-Compare with another object.
+Check equality.
 
 <a id="aea.configurations.data_types.PublicId.__lt__"></a>
 
@@ -795,7 +795,7 @@ Get the object representation in string.
 def __eq__(other: Any) -> bool
 ```
 
-Compare with another object.
+Check equality.
 
 <a id="aea.configurations.data_types.PackageId.__lt__"></a>
 
@@ -1080,7 +1080,7 @@ Get the string representation.
 def __eq__(other: Any) -> bool
 ```
 
-Compare with another object.
+Check equality.
 
 <a id="aea.configurations.data_types.Dependencies"></a>