work on v0.3.0

argenta/command/entity.py

@@ -14,7 +14,7 @@ class Command:
         self._description = description
         self._flags = flags
 
-        self._input_flags: FlagsGroup | None = None
+        self._input_flags: InputFlag | FlagsGroup | None = None
 
     def get_string_entity(self):
         return self._command
@@ -37,17 +37,23 @@ class Command:
             raise InvalidCommandInstanceException(self._command)
         if not isinstance(self._description, str):
             raise InvalidDescriptionInstanceException()
-        if not (isinstance(self._flags, Flag) or not isinstance(self._flags, FlagsGroup)) or not self._flags is None:
+        if not any([(isinstance(self._flags, Flag), isinstance(self._flags, FlagsGroup)), not self._flags]):
             raise InvalidFlagsInstanceException
 
     def validate_input_flag(self, flag: InputFlag):
-        registered_flags: FlagsGroup = self._flags
+        registered_flags: FlagsGroup | Flag | None = self._flags
         if registered_flags:
-            for registered_flag in registered_flags:
-                if registered_flag.get_string_entity() == flag.get_string_entity():
-                    is_valid = registered_flag.validate_input_flag_value(flag)
+            if isinstance(registered_flags, Flag):
+                if registered_flags.get_string_entity() == flag.get_string_entity():
+                    is_valid = registered_flags.validate_input_flag_value(flag.get_value())
                     if is_valid:
                         return True
+            else:
+                for registered_flag in registered_flags:
+                    if registered_flag.get_string_entity() == flag.get_string_entity():
+                        is_valid = registered_flag.validate_input_flag_value(flag.get_value())
+                        if is_valid:
+                            return True
         return False
 
 

argenta/command/input_comand/entity.py

@@ -50,6 +50,8 @@ class InputCommand(Command, Generic[T]):
 
                 current_flag_name = None
                 current_flag_value = None
+        if any([current_flag_name, current_flag_value]):
+            raise IncorrectInputFlagException()
         if len(flags.get_flags()) == 0:
             return InputCommand(command=command)
         else:

argenta/command/params/flag/entity.py

@@ -18,7 +18,6 @@ class Flag:
             string_entity: str = self.flag_prefix + self.flag_name.lower()
         else:
             string_entity: str = self.flag_prefix + self.flag_name
-        print(string_entity)
         return string_entity
 
     def get_value(self):