iniUts 1.1.9__tar.gz → 1.2.1__tar.gz

{iniUts-1.1.9/iniUts.egg-info → iniuts-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iniUts
-Version: 1.1.9
+Version: 1.2.1
 Summary: Ini file manipulator
 Home-page: 
 Author: Melque Lima

{iniUts-1.1.9 → iniuts-1.2.1}/iniUts/__init__.py

@@ -2,6 +2,23 @@ import configparser as cp
 from dataclasses import dataclass
 from datetime import datetime
 import re
+import os
+
+class envar():
+    def __init__(self,key:str,default:str=None):
+        self.key  = key
+        self.default = default
+    
+    def get_value(self):
+        if self.default != None:
+            return os.getenv(self.key,self.default)
+        else:
+            value = os.getenv(self.key)
+            if not value:
+                raise Exception(f"envar '{self.key}' not found!")
+            return value
+
+    
 
 
 class IniUts():
@@ -112,9 +129,19 @@ class IniUts():
             v = cls(v)
         return v
 
+    def setup_initial_values(self,dtClass):
+        for k in dtClass.__annotations__:
+            if not hasattr(dtClass, k):
+                setattr(dtClass, k, None)
+        return dtClass
+
     def section2DataClass(self,section,dtClass,skip_missing=False,empty_as_null=False):
         dt = self.Section2Dict(section,empty_as_null=empty_as_null)
         dt2 = self.Section2Dict(section,empty_as_null=empty_as_null,fileIni=self.prd_file)
+
+        dtClass = self.setup_initial_values(dtClass)
+
+        #VALIDA AS KEYS NO INI DE DEV
         for k, v in dt.items():
             if not k in dtClass.__annotations__:
                 if not skip_missing:
@@ -122,26 +149,33 @@ class IniUts():
                 else:
                     continue
             v = self.format_data(dtClass,k,v)
-
-            
-
             setattr(dtClass, k, v)
         
+        class_keys = [x for x in dtClass.__annotations__ if getattr(dtClass,x) != envar]
         
-        MissingKeysFromClass = lambda x:list(set(dtClass.__annotations__.keys())  - set(x.keys()))
+        MissingKeysFromClass = lambda x:list(set(class_keys)  - set(x.keys()))
 
         #VERIFICA SE AS KEYS NAO ENCONTRADAS ESTAO NO ARQUIVO DE PRD:
         if not self.in_prd:
             for k in MissingKeysFromClass(dt):
                 if not k in dt2.keys():
+                    if isinstance(getattr(dtClass,k),envar):
+                        v = getattr(dtClass,k).get_value()
+                        setattr(dtClass, k, v)
+                        continue
                     if not skip_missing:
-                        raise Exception(f"Cound not find '{MissingKeysFromClass(dt)}' keys at section '{section}' in ini file")
+                        raise Exception(f"Cound not find '{k}' keys at section '{section}' in ini file")
                     continue
                 v = self.format_data(dtClass,k,dt2[k])
                 setattr(dtClass, k, v)
         else:
-            if not skip_missing and MissingKeysFromClass(dt):
-                raise Exception(f"Cound not find '{MissingKeysFromClass(dt)}' keys at section '{section}' in ini file")
+            for k in MissingKeysFromClass(dt):
+                if isinstance(getattr(dtClass,k),envar):
+                    v = getattr(dtClass,k).get_value()
+                    setattr(dtClass, k, v)
+                    continue
+                if not skip_missing and MissingKeysFromClass(dt):
+                    raise Exception(f"Cound not find '{k}' keys at section '{section}' in ini file")
 
     def link(self,section,skip_missing=False,empty_as_null=False):
         def wrap(function):

{iniUts-1.1.9 → iniuts-1.2.1/iniUts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iniUts
-Version: 1.1.9
+Version: 1.2.1
 Summary: Ini file manipulator
 Home-page: 
 Author: Melque Lima

{iniUts-1.1.9 → iniuts-1.2.1}/run.py

@@ -7,19 +7,22 @@ from iniUts import *
 load_dotenv()
 
 ini = IniUts('prd_config.ini')
-ini = IniUts('prd_config.ini','dev_config.ini',in_prd=False)
+ini = IniUts('prd_config.ini','dev_config.ini',in_prd=True)
 
 #TODAS AS CHAVES DE DEV DEVE CONTER EM PRD
 
 
 @ini.link('PERSON')
 class Person():
+    USERNAME: str = envar("USERNAME","NO_NAME")
     NAME   : str
     age    : int
     amount : float
     friends: tuple = ','
     dob    : datetime = "%Y-%m-%d"
 
+
+pass
 # pass
 # a = 1
 

{iniUts-1.1.9 → iniuts-1.2.1}/setup.py

@@ -10,7 +10,7 @@ classifiers = [
  
 setup(
   name='iniUts',
-  version='1.1.9',
+  version='1.2.1',
   description='Ini file manipulator',
   long_description=open('README.md').read() + '\n\n' + open('CHANGELOG.txt').read(),
   long_description_content_type='text/markdown',