more working

argenta/command/flag/__init__.py

@@ -0,0 +1,4 @@
+__all__ = ('InputFlags', 'InputFlag', 'Flag', 'Flags')
+
+
+from .models import InputFlags, InputFlag, Flags, Flag

argenta/command/flag/defaults.py

@@ -4,7 +4,7 @@ import re
 
 
 @dataclass
-class DefaultFlags:
+class PredeterminedFlags:
     HELP = Flag(name='help', possible_values=False)
     SHORT_HELP = Flag(name='h', prefix='-', possible_values=False)
 

argenta/command/flag/models.py

@@ -4,11 +4,9 @@ from abc import ABC, abstractmethod
 
 class BaseFlag:
     def __init__(self, name: str,
-                 prefix: Literal['-', '--', '---'] = '--',
-                 possible_values: list[str] | Pattern[str] | False = True):
+                 prefix: Literal['-', '--', '---'] = '--'):
         self._name = name
         self._prefix = prefix
-        self.possible_values = possible_values
 
     def get_string_entity(self):
         string_entity: str = self._prefix + self._name
@@ -25,9 +23,9 @@ class BaseFlag:
 class InputFlag(BaseFlag):
     def __init__(self, name: str,
                  prefix: Literal['-', '--', '---'] = '--',
-                 possible_values: list[str] | Pattern[str] | False = True):
-        super().__init__(name, prefix, possible_values)
-        self._flag_value = None
+                 value: str = None):
+        super().__init__(name, prefix)
+        self._flag_value = value
 
     def get_value(self):
         return self._flag_value
@@ -38,6 +36,12 @@ class InputFlag(BaseFlag):
 
 
 class Flag(BaseFlag):
+    def __init__(self, name: str,
+                 prefix: Literal['-', '--', '---'] = '--',
+                 possible_values: list[str] | Pattern[str] | False = True):
+        super().__init__(name, prefix)
+        self.possible_values = possible_values
+
     def validate_input_flag_value(self, input_flag_value: str | None):
         if self.possible_values is False:
             if input_flag_value is None:
@@ -45,9 +49,12 @@ class Flag(BaseFlag):
             else:
                 return False
         elif isinstance(self.possible_values, Pattern):
-            is_valid = bool(self.possible_values.match(input_flag_value))
-            if bool(is_valid):
-                return True
+            if isinstance(input_flag_value, str):
+                is_valid = bool(self.possible_values.match(input_flag_value))
+                if bool(is_valid):
+                    return True
+                else:
+                    return False
             else:
                 return False