Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on clean up of some code... logging and pydantic field config.

Browse Source
This commit is contained in:
Scott Idem
2021-03-11 14:19:17 -05:00
parent 5574f50586
commit 143e099e13
13 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin/documentation/run locally.txt
View File

@@ -9,6 +9,9 @@ source environment/bin/activate
# Install application requirements # Install application requirements
pip install -r admin/requirements.txt pip install -r admin/requirements.txt
pip install --upgrade --force-reinstall -r admin/requirements.txt
pip install --ignore-installed -r admin/requirements.txt
pip list
# Start application # Start application
uvicorn app.main:app --host 0.0.0.0 --port 5005 --reload uvicorn app.main:app --host 0.0.0.0 --port 5005 --reload

3
app/models/account_cfg_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
@@ -113,4 +112,4 @@ class Account_Cfg_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
Account_Cfg_Base.update_forward_refs() #Account_Cfg_Base.update_forward_refs()

3
app/models/account_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
@@ -60,4 +59,4 @@ class Account_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
Account_Base.update_forward_refs() #Account_Base.update_forward_refs()

13
app/models/address_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
#from .account_model import Account_Base #from .account_model import Account_Base
@@ -15,10 +14,8 @@ class Address_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
#from .account_model import Account_Base id_random: Optional[str] = Field(
**base_fields['address_id_random'],
id_random: str = Field(
#**base_fields['address_id_random'],
alias='address_id_random', alias='address_id_random',
default_factory=lambda:secrets.token_urlsafe(default_num_bytes), default_factory=lambda:secrets.token_urlsafe(default_num_bytes),
) )
@@ -29,7 +26,7 @@ class Address_Base(BaseModel):
account_id: Optional[int] account_id: Optional[int]
for_type: Optional[str] for_type: Optional[str]
for_id_random: Optional[str] = None for_id_random: Optional[str]
for_id: Optional[int] for_id: Optional[int]
#organization: Optional[Organization_Base] = Organization_Base() #organization: Optional[Organization_Base] = Organization_Base()
@@ -117,6 +114,6 @@ class Address_Base(BaseModel):
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
#fields = base_fields fields = base_fields
Address_Base.update_forward_refs() #Address_Base.update_forward_refs()

3
app/models/archive_content_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
@@ -112,4 +111,4 @@ class Archive_Content_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
Archive_Content_Base.update_forward_refs() #Archive_Content_Base.update_forward_refs()

3
app/models/archive_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
@@ -92,4 +91,4 @@ class Archive_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
Archive_Base.update_forward_refs() #Archive_Base.update_forward_refs()

2
app/models/common_field_schema.py
View File

@@ -1,4 +1,4 @@
import copy, datetime, hashlib, logging, os, pytz, redis, secrets import copy, datetime, hashlib, pytz, secrets
default_num_bytes = 8 # URL safe 8 bytes is 11 characters long and 16 bytes is 22 characters long default_num_bytes = 8 # URL safe 8 bytes is 11 characters long and 16 bytes is 22 characters long

8
app/models/contact_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
#from .account_model import Account_Base #from .account_model import Account_Base
@@ -16,9 +15,6 @@ class Contact_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
#from .account_model import Account_Base
#from .address_model import Address_Base
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['contact_id_random'], **base_fields['contact_id_random'],
alias='contact_id_random', alias='contact_id_random',
@@ -33,7 +29,7 @@ class Contact_Base(BaseModel):
address_id: Optional[int] address_id: Optional[int]
for_type: Optional[str] for_type: Optional[str]
for_id_random: Optional[str] = None for_id_random: Optional[str]
for_id: Optional[int] for_id: Optional[int]
name: Optional[str] name: Optional[str]
@@ -127,4 +123,4 @@ class Contact_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
Contact_Base.update_forward_refs() #Contact_Base.update_forward_refs()

1
app/models/core_object_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes

3
app/models/event_session_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
@@ -128,4 +127,4 @@ class Event_Session_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
Event_Session_Base.update_forward_refs() #Event_Session_Base.update_forward_refs()

3
app/models/user_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
#from .account_model import Account_Base #from .account_model import Account_Base
@@ -138,4 +137,4 @@ class User_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
User_Base.update_forward_refs() #User_Base.update_forward_refs()

5
app/models/user_role_model.py
View File

@@ -5,7 +5,6 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes from .common_field_schema import base_fields, default_num_bytes
from .user_model import Contact_Base from .user_model import Contact_Base
@@ -29,7 +28,7 @@ class User_Role_Base(BaseModel):
role_id: Optional[int] role_id: Optional[int]
for_type: Optional[str] for_type: Optional[str]
for_id_random: Optional[str] = None for_id_random: Optional[str]
for_id: Optional[int] for_id: Optional[int]
enable: Optional[bool] enable: Optional[bool]
@@ -83,4 +82,4 @@ class User_Role_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
User_Role_Base.update_forward_refs() #User_Role_Base.update_forward_refs()

1
app/routers/api_crud.py
View File

@@ -5,7 +5,6 @@ from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from ..lib_general import * from ..lib_general import *
from ..log import *
from app.config import settings from app.config import settings
from app.db_sql import * from app.db_sql import *