General clean up

2021-06-24 12:26:35 -04:00
parent 6e0ceefa48
commit e11639bf24
7 changed files with 173 additions and 161 deletions
--- a/app/main.py
+++ b/app/main.py
@@ -1,4 +1,4 @@
-import logging, os, random # , uvicorn
+import datetime, json, logging, os, pytz, random, secrets # , uvicorn

 from enum import Enum
 #from datetime import datetime, time, timedelta
@@ -14,7 +14,7 @@ from sqlalchemy import create_engine, text
 from sqlalchemy.exc import IntegrityError, OperationalError

 from . import config
-from app.lib_general import *
+from app.lib_general import log, logging
 from app.log import log

 # Import the routers here first:
@@ -57,162 +57,102 @@ app.include_router(
    api.router,
    prefix='/api',
    tags=['API'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    flask_cfg.router,
    prefix='/flask_cfg',
    tags=['Flask CFG'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 # app.include_router(
 #     flask_cfg.router,
 #     prefix='/redis',
 #     tags=['Redis'],
-#     #dependencies=[Depends(get_token_header)],
-#     #dependencies=[Depends(get_account_header)],
-#     #responses={404: {'description': 'Not found'}},
 # )

 app.include_router(
    account.router,
    prefix='/account',
    tags=['Account'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    address.router,
    prefix='/address',
    tags=['Address'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    archive.router,
    prefix='/archive',
    tags=['Archive'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    archive_content.router,
    prefix='/archive/content',
    tags=['Archive Content'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    contact.router,
    prefix='/contact',
    tags=['Contact'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event.router,
    prefix='/event',
    tags=['Event'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event_exhibit.router,
    prefix='/event/exhibit',
    tags=['Event Exhibit'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event_file.router,
    prefix='/event/file',
    tags=['Event File'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event_person.router,
    prefix='/event/person',
    tags=['Event Person'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event_person.router,
    prefix='/event/person/detail',
    tags=['Event Person Detail'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event_presentation.router,
    prefix='/event/presentation',
    tags=['Event Presenter'],
-    #dependencies=[DependPresenter(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event_presenter.router,
    prefix='/event/presenter',
    tags=['Event Presenter'],
-    #dependencies=[DependPresenter(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event_registration.router,
    prefix='/event/registration',
    tags=['Event Registration'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    event_session.router,
    prefix='/event/session',
    tags=['Event Session'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    hosted_file.router,
    prefix='/hosted_file',
    tags=['Hosted File'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    journal.router,
    prefix='/journal',
    tags=['Journal'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    journal_entry.router,
    prefix='/journal/entry',
    tags=['Journal Entry'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    lookup.router,
@@ -238,89 +178,56 @@ app.include_router(
    order.router,
    prefix='/order',
    tags=['Order'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    order_cart.router,
    prefix='/order/cart',
    tags=['Order Cart'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    organization.router,
    prefix='/organization',
    tags=['Organization'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    page.router,
    prefix='/page',
    tags=['Page'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    person.router,
    prefix='/person',
    tags=['Person'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    post.router,
    prefix='/post',
    tags=['Post'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    post_comment.router,
    prefix='/post/comment',
    tags=['Post Comment'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    product.router,
    prefix='/product',
    tags=['Product'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    site.router,
    prefix='/site',
    tags=['Site'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    site_domain.router,
    prefix='/site/domain',
    tags=['Site Domain'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    user.router,
    prefix='/user',
    tags=['User'],
-    #dependencies=[Depends(get_token_header)],
-    #dependencies=[Depends(get_account_header)],
-    #responses={404: {'description': 'Not found'}},
 )
 app.include_router(
    user_person.router,
@@ -396,38 +303,74 @@ async def add_process_time_header(request: Request, call_next):
    return response


-@app.get('/', tags=['Default'])
-async def get_root():
-    log.setLevel(logging.INFO) # DEBUG, INFO, WARN, WARNING, ERROR, EXCEPTION, CRITICAL
+# ### BEGIN ### API Main ### fastapi_root() ###
+@app.get('/', tags=['Root'], response_class=PlainTextResponse)
+async def fastapi_root():
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARN, WARNING, ERROR, EXCEPTION, CRITICAL
    log.debug(locals())

    log.info(config.settings.APP_NAME)

-    log.setLevel(logging.DEBUG)
-
-    print('***')
+    log.info('***')
    log.debug('This is debug') # 10 DEBUG
    log.info('This is info') # 20 INFO
-    log.warn('This is warn') # 30 WARNING
-    log.warning('This is a warning') # 30 WARNING
+    log.warning('This is a warning') # 30 WARNING (and WARN)
    log.error('This is an error') # 40 ERROR
    log.exception('This is an exception') # 40 ERROR
    log.critical('This is critical') # 50 CRITICAL
-    #print('----')
-    #logging.debug('This is debug') # 10 DEBUG
-    #logging.info('This is info') # 20 INFO
-    #logging.warn('This is warn') # 30 WARNING
-    #logging.warning('This is a warning') # 30 WARNING
-    #logging.error('This is an error') # 40 ERROR
-    #logging.exception('This is an exception') # 40 ERROR
-    #logging.critical('This is critical') # 50 CRITICAL
-    print('^^^')
+    log.info('^^^')

-    return {'hello': 'This is the Aether API using FastAPI.'}
+    response_data = {}
+    response_data['message'] = 'This is the Aether API using FastAPI.'


+    current_datetime = datetime.datetime.now()
+    current_datetime_string = current_datetime.isoformat()
+
+    timezone = pytz.timezone("America/New_York")
+    current_datetime_tz = timezone.localize(current_datetime)
+    current_datetime_tz_string = current_datetime_tz.isoformat()
+
+    current_datetime_utc = datetime.datetime.utcnow()
+    current_datetime_utc_string = current_datetime_utc.isoformat()
+
+    current_datetime_utc_localize = pytz.utc.localize(current_datetime_utc)
+    current_datetime_utc_localize_string = current_datetime_utc_localize.isoformat()
+
+    current_datetime_utc_localize_pst = current_datetime_utc_localize.astimezone(pytz.timezone("America/Los_Angeles"))
+    current_datetime_utc_localize_pst_string = current_datetime_utc_localize_pst.isoformat()
+
+    response_data['datetime'] = current_datetime_string
+    response_data['datetime_tz'] = current_datetime_tz_string
+    response_data['datetime_utc'] = current_datetime_utc_string
+    response_data['datetime_utc_localize'] = current_datetime_utc_localize_string
+    response_data['datetime_utc_localize_pst'] = current_datetime_utc_localize_pst_string
+
+    response_data['url_safe_string_4_bytes_1'] = secrets.token_urlsafe(4)
+    response_data['url_safe_string_8_bytes_1'] = secrets.token_urlsafe(8)
+    response_data['url_safe_string_8_bytes_2'] = secrets.token_urlsafe(8)
+    response_data['url_safe_string_8_bytes_3'] = secrets.token_urlsafe(8)
+    response_data['url_safe_string_8_bytes_4'] = secrets.token_urlsafe(8)
+    response_data['url_safe_string_8_bytes_5'] = secrets.token_urlsafe(8)
+    response_data['url_safe_string_16_bytes_1'] = secrets.token_urlsafe(16)
+    response_data['url_safe_string_16_bytes_2'] = secrets.token_urlsafe(16)
+    response_data['url_safe_string_16_bytes_3'] = secrets.token_urlsafe(16)
+    response_data['url_safe_string_16_bytes_4'] = secrets.token_urlsafe(16)
+    response_data['url_safe_string_16_bytes_5'] = secrets.token_urlsafe(16)
+
+    response_data['hex_string_4_bytes_1'] = secrets.token_hex(4)
+    response_data['hex_string_8_bytes_1'] = secrets.token_hex(8)
+    response_data['hex_string_16_bytes_1'] = secrets.token_hex(16)
+    response_data['hex_string_32_bytes_1'] = secrets.token_hex(32)
+
+    log.debug(json.dumps(response_data, indent=4))
+    return json.dumps(response_data, indent=4) # , sort_keys=True
+# ### END ### API Main ### fastapi_root() ###
+
+
+# ### BEGIN ### API Main ### quick_test() ###
 # ### TEST TEST TEST ### #
-@app.get('/quick_test', tags=['Default'])
+@app.get('/quick_test', tags=['Testing'], response_class=PlainTextResponse)
 async def quick_test():
    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARN, WARNING, ERROR, EXCEPTION, CRITICAL
    log.debug(locals())
@@ -435,11 +378,11 @@ async def quick_test():
    log.info('Getting all accounts...')

    sql = text(
-    """
-    SELECT *
-    FROM `account`
-    """
-    )
+        """
+        SELECT id, id_random, name, enable
+        FROM `account`
+        """
+        )
    try:
        result = db.execute(sql)
    except Exception as e:
@@ -450,16 +393,16 @@ async def quick_test():
        log.error('^^^ exception ^^^')
    else:
        if result.rowcount:
-            records = result.fetchall()
-            log.debug(records)
+            record_li = [dict(record) for record in result.fetchall()]
+            log.debug(record_li)
        else:
-            log.warning('Something went wrong.')
+            log.error('No records found. Something went wrong.')

    log.info('Got the account list')

-    response = {}
-    response['hello'] = 'This is the Aether API using FastAPI.'
-    response['data'] = records
+    response_data = {}
+    response_data['message'] = 'This is the Aether API using FastAPI.'
+    response_data['data'] = record_li

-    return response
-# ### TEST TEST TEST ### #
+    return json.dumps(response_data, indent=4) # , sort_keys=True
+# ### END ### API Main ### quick_test() ###