Work on API tokens

app/models/api_models.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
 from app.db_sql import redis_lookup_id_random
 from app.lib_general import *
 
-from .common_field_schema import base_fields, default_num_bytes
+from app.models.common_field_schema import base_fields, default_num_bytes
 
 
 class Api_Base(BaseModel):
@@ -15,8 +15,11 @@ class Api_Base(BaseModel):
     log.debug(locals())
 
     id: Optional[int]
+
     name: Optional[str]
+
     secret_key: Optional[str]
+
     enable: Optional[bool]
     enable_from: Optional[datetime.datetime] = Field(
         default_factory = lambda:datetime.datetime.now,
@@ -26,9 +29,17 @@ class Api_Base(BaseModel):
     temporary_token: str = Field(
         default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
         )
-    expire_on: Optional[datetime.datetime] = Field(
-        default_factory=datetime.datetime.now,
+    # expire_on: datetime.datetime = Field(
+    #     default_factory=datetime.datetime.now,
+    #     )
+    expire_on: datetime.datetime = Field(
+        default_factory = lambda:datetime.datetime.now() + datetime.timedelta(seconds=120),
         )
+    # expire_on: Optional[datetime.datetime] = Field(
+    #     default_factory = lambda:datetime.datetime.now,
+    #     )
+
+    # expire_on: Optional[datetime.datetime] # = datetime.datetime.now
 
     created_on: Optional[datetime.datetime] = None
     updated_on: Optional[datetime.datetime] = None
@@ -37,6 +48,7 @@ class Api_Base(BaseModel):
 
     class Config:
         underscore_attrs_are_private = True
+        allow_population_by_field_name = True
         #fields = base_fields
 
 #Account_Base.update_forward_refs()