Skip to content

Commit

Permalink
applying black formatter to python code
Browse files Browse the repository at this point in the history
  • Loading branch information
mgonzs13 committed Feb 5, 2025
1 parent 20acede commit 21c8ac1
Show file tree
Hide file tree
Showing 70 changed files with 1,058 additions and 1,289 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ A Python and a C++ demo are included.
```python
#!/usr/bin/env python3

""" DAO Example Node """
"""DAO Example Node"""

import rclpy

Expand All @@ -139,7 +139,7 @@ from simple_node import Node


class ExampleNode(Node):
""" DAO Example Node Class """
"""DAO Example Node Class"""

def __init__(self):

Expand Down
3 changes: 1 addition & 2 deletions kant_dao/kant_dao/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

from .parameter_loader import ParameterLoader
from kant_dao.parameter_loader import ParameterLoader
2 changes: 0 additions & 2 deletions kant_dao/kant_dao/dao_factory/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@


from kant_dao.dao_factory.dao_factory_method import DaoFactoryMethod
from kant_dao.dao_factory.dao_families import DaoFamilies
10 changes: 2 additions & 8 deletions kant_dao/kant_dao/dao_factory/dao_factories/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@


from kant_dao.dao_factory.dao_factories.dao_factory import DaoFactory
from kant_dao.dao_factory.dao_factories.ros2_dao_factory import (
Ros2DaoFactory
)
from kant_dao.dao_factory.dao_factories.mongo_dao_factory import (
MongoDaoFactory
)
from kant_dao.dao_factory.dao_factories.ros2_dao_factory import Ros2DaoFactory
from kant_dao.dao_factory.dao_factories.mongo_dao_factory import MongoDaoFactory
16 changes: 8 additions & 8 deletions kant_dao/kant_dao/dao_factory/dao_factories/dao_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,56 +14,56 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.


""" Dao Facory Interface """
"""Dao Factory Interface"""

from abc import ABC, abstractmethod
from kant_dao.dao_interface import (
PddlTypeDao,
PddlObjectDao,
PddlPredicateDao,
PddlPropositionDao,
PddlActionDao
PddlActionDao,
)


class DaoFactory(ABC):
""" Dao Facory Abstract Class """
"""Dao Factory Abstract Class"""

@abstractmethod
def create_pddl_type_dao(self) -> PddlTypeDao:
""" create a pddl dao type object
"""create a pddl dao type object
Returns:
PddlTypeDao: dao for pddl type
"""

@abstractmethod
def create_pddl_predicate_dao(self) -> PddlPredicateDao:
""" create a pddl dao predicate object
"""create a pddl dao predicate object
Returns:
PddlPredicateDao: dao for pddl predicate
"""

@abstractmethod
def create_pddl_action_dao(self) -> PddlActionDao:
""" create a pddl dao action object
"""create a pddl dao action object
Returns:
PddlActionDao: dao for pddl action
"""

@abstractmethod
def create_pddl_object_dao(self) -> PddlObjectDao:
""" create a pddl dao object object
"""create a pddl dao object object
Returns:
PddlObjectDao: dao for pddl object
"""

@abstractmethod
def create_pddl_proposition_dao(self) -> PddlPropositionDao:
""" create a pddl dao type object
"""create a pddl dao type object
Returns:
PddlPropositionDao: dao for pddl proposition
Expand Down
23 changes: 11 additions & 12 deletions kant_dao/kant_dao/dao_factory/dao_factories/mongo_dao_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.


""" Mongo Dao Facory """
"""Mongo Dao Factory"""

from mongoengine import disconnect, connect

Expand All @@ -23,28 +23,27 @@
MongoPddlObjectDao,
MongoPddlPredicateDao,
MongoPddlPropositionDao,
MongoPddlActionDao
MongoPddlActionDao,
)

from kant_dao.dao_factory.dao_factories.dao_factory import DaoFactory


class MongoDaoFactory(DaoFactory):
""" Mongo Dao Facory Class """
"""Mongo Dao Factory Class"""

def __init__(self, uri: str = "mongodb://localhost:27017/kant"):
self.set_uri(uri)
self.connect()

def connect(self):
""" connect to current uri
"""
"""connect to current uri"""

disconnect()
connect(host=self._uri)

def get_uri(self) -> str:
""" uri getter
"""uri getter
Returns:
str: uri str
Expand All @@ -53,7 +52,7 @@ def get_uri(self) -> str:
return self._uri

def set_uri(self, uri: str):
""" uri setter
"""uri setter
Args:
uri (str): uri str
Expand All @@ -62,7 +61,7 @@ def set_uri(self, uri: str):
self._uri = uri

def create_pddl_type_dao(self) -> MongoPddlTypeDao:
""" create a mongo pddl dao type object
"""create a mongo pddl dao type object
Returns:
MongoPddlTypeDao: mongoengine dao for pddl type
Expand All @@ -71,7 +70,7 @@ def create_pddl_type_dao(self) -> MongoPddlTypeDao:
return MongoPddlTypeDao(uri=self._uri, connect=False)

def create_pddl_predicate_dao(self) -> MongoPddlPredicateDao:
""" create a mongo pddl dao predicate object
"""create a mongo pddl dao predicate object
Returns:
MongoPddlPredicateDao: mongoengine dao for pddl predicate
Expand All @@ -80,7 +79,7 @@ def create_pddl_predicate_dao(self) -> MongoPddlPredicateDao:
return MongoPddlPredicateDao(uri=self._uri, connect=False)

def create_pddl_action_dao(self) -> MongoPddlActionDao:
""" create a mongo pddl dao action object
"""create a mongo pddl dao action object
Returns:
MongoPddlActionDao: mongoengine dao for pddl action
Expand All @@ -89,7 +88,7 @@ def create_pddl_action_dao(self) -> MongoPddlActionDao:
return MongoPddlActionDao(uri=self._uri, connect=False)

def create_pddl_object_dao(self) -> MongoPddlObjectDao:
""" create a mongo pddl dao object object
"""create a mongo pddl dao object object
Args:
uri (str, optional): Mongo uri. Defaults to None.
Expand All @@ -101,7 +100,7 @@ def create_pddl_object_dao(self) -> MongoPddlObjectDao:
return MongoPddlObjectDao(uri=self._uri, connect=False)

def create_pddl_proposition_dao(self) -> MongoPddlPropositionDao:
""" create a mongo pddl dao proposition object
"""create a mongo pddl dao proposition object
Returns:
MongoPddlPropositionDao: mongoengine dao for pddl proposition
Expand Down
20 changes: 10 additions & 10 deletions kant_dao/kant_dao/dao_factory/dao_factories/ros2_dao_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.


""" Ros2 Dao Facory """
"""Ros2 Dao Factory"""

from rclpy.node import Node

Expand All @@ -23,20 +23,20 @@
Ros2PddlObjectDao,
Ros2PddlPredicateDao,
Ros2PddlPropositionDao,
Ros2PddlActionDao
Ros2PddlActionDao,
)

from kant_dao.dao_factory.dao_factories.dao_factory import DaoFactory


class Ros2DaoFactory(DaoFactory):
""" Ros2 Dao Facory Class """
"""Ros2 Dao Factory Class"""

def __init__(self, node: Node):
self.set_node(node)

def get_node(self) -> Node:
""" node getter
"""node getter
Returns:
None: node
Expand All @@ -45,7 +45,7 @@ def get_node(self) -> Node:
return self._node

def set_node(self, node: Node):
""" node setter
"""node setter
Args:
node (None): Node
Expand All @@ -54,7 +54,7 @@ def set_node(self, node: Node):
self._node = node

def create_pddl_type_dao(self) -> Ros2PddlTypeDao:
""" create a kant dao type object
"""create a kant dao type object
Returns:
Ros2PddlTypeDao: kant dao for pddl type
Expand All @@ -63,7 +63,7 @@ def create_pddl_type_dao(self) -> Ros2PddlTypeDao:
return Ros2PddlTypeDao(self._node)

def create_pddl_predicate_dao(self) -> Ros2PddlPredicateDao:
""" create a kant dao predicate object
"""create a kant dao predicate object
Returns:
Ros2PddlPredicateDao: kant dao for pddl predicate
Expand All @@ -72,7 +72,7 @@ def create_pddl_predicate_dao(self) -> Ros2PddlPredicateDao:
return Ros2PddlPredicateDao(self._node)

def create_pddl_action_dao(self) -> Ros2PddlActionDao:
""" create a kant dao action object
"""create a kant dao action object
Returns:
Ros2PddlActionDao: kant dao for pddl action
Expand All @@ -81,7 +81,7 @@ def create_pddl_action_dao(self) -> Ros2PddlActionDao:
return Ros2PddlActionDao(self._node)

def create_pddl_object_dao(self) -> Ros2PddlObjectDao:
""" create a kant dao object object
"""create a kant dao object object
Returns:
Ros2PddlObjectDao: kant dao for pddl object
Expand All @@ -90,7 +90,7 @@ def create_pddl_object_dao(self) -> Ros2PddlObjectDao:
return Ros2PddlObjectDao(self._node)

def create_pddl_proposition_dao(self) -> Ros2PddlPropositionDao:
""" create a kant dao proposition object
"""create a kant dao proposition object
Returns:
Ros2PddlPropositionDao: kant dao for pddl proposition
Expand Down
14 changes: 5 additions & 9 deletions kant_dao/kant_dao/dao_factory/dao_factory_method.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,25 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.


""" Dao Factory of Factories """
"""Dao Factory of Factories"""

from kant_dao.dao_factory.dao_families import DaoFamilies

from kant_dao.dao_factory.dao_factories import (
DaoFactory,
Ros2DaoFactory,
MongoDaoFactory
)
from kant_dao.dao_factory.dao_factories import DaoFactory, Ros2DaoFactory, MongoDaoFactory


class DaoFactoryMethod:
""" Dao Factory of Factories Class """
"""Dao Factory of Factories Class"""

def __init__(self):
self.dao_families = DaoFamilies
self.__families_to_factory = {
self.dao_families.ROS2: Ros2DaoFactory,
self.dao_families.MONGO: MongoDaoFactory
self.dao_families.MONGO: MongoDaoFactory,
}

def create_dao_factory(self, family: int, **kwargs) -> DaoFactory:
""" create a pddl dao factory of a given family
"""create a pddl dao factory of a given family
Args:
family (int): number of the pddl dao family to create
Expand Down
4 changes: 2 additions & 2 deletions kant_dao/kant_dao/dao_factory/dao_families.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.


""" Dao Familis Enumeration """
"""Dao Familis Enumeration"""

from enum import IntEnum, auto


class DaoFamilies(IntEnum):
""" Enum Class of Dao Families """
"""Enum Class of Dao Families"""

def _generate_next_value_(self, _start, count, _last_values):
"""Generate consecutive automatic numbers starting from zero."""
Expand Down
1 change: 0 additions & 1 deletion kant_dao/kant_dao/dao_interface/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

from kant_dao.dao_interface.dao import Dao
from kant_dao.dao_interface.pddl_type_dao import PddlTypeDao
from kant_dao.dao_interface.pddl_object_dao import PddlObjectDao
Expand Down
Loading

0 comments on commit 21c8ac1

Please sign in to comment.