From ae0936682621babb2f435318dba5370589073813 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 19 Jan 2026 09:53:06 -0500 Subject: [PATCH] clean cache data --- app/api/services/base_service.py | 30 +++++++------------------- app/config.py | 37 +++++++++++++++++++------------- 2 files changed, 30 insertions(+), 37 deletions(-) diff --git a/app/api/services/base_service.py b/app/api/services/base_service.py index 9e226f1..eaa0c00 100644 --- a/app/api/services/base_service.py +++ b/app/api/services/base_service.py @@ -27,6 +27,10 @@ class BaseService: SEND_EMAIL_PASS = Config.SEND_EMAIL_PASS THIS_SITE_URL = Config.THIS_SITE_URL + CACHE_SERVER = Config.CACHE_SERVER + CACHE_PORT = Config.CACHE_PORT + CACHE_PASSWORD = Config.CACHE_PASSWORD + @staticmethod def addStripeCustomer(customerData): customer_data = { @@ -391,39 +395,21 @@ class BaseService: def write_cache_data(cacheSection, cacheId, cacheData): try: - cacheKey = cacheSection + ':' + cacheId + cacheKey = cacheSection + '-' + cacheId logger.info(f"write_cache_data () key {cacheKey}", exc_info=True) # Define connection parameters and connect - r = redis.Redis(host='10.10.33.35', port=6378, - password='7f079034e166ecf52d82cbec9876e4dc8a154b0c37248f3fa1734d4eeab938d5', + r = redis.Redis(host=BaseService.CACHE_SERVER, port=BaseService.CACHE_PORT, + password=BaseService.CACHE_PASSWORD, decode_responses=True) # Set a key 'foo' with value 'bar' json_string = json.dumps(cacheData, indent=4) - r.set(cacheKey, json_string) + r.set(cacheKey, json_string, ex=120) # Verify by getting the value value = r.get(cacheKey) print(f"Value of {cacheKey}: {value}") # Output: Value of 'foo': bar - # Store a user session as a hash - # user_data = { - # 'name': 'John', - # 'surname': 'Smith', - # 'company': 'Redis', - # 'age': 29 - # } - # json_string = json.dumps(cacheData, indent=4) - # - # r.set(cacheSection + ':user-session:123', json_string) - - # r.hset(cacheSection +':user-session:123', mapping=json_string) - - # Retrieve all fields of the hash - # session_details = r.hgetall('user-session:123') - # print(f"Session details: {session_details}") - # Output: Session details: {'name': 'John', 'surname': 'Smith', 'company': 'Redis', 'age': '29'} - response_data = { "session_details": value, # "product_id": product_id, diff --git a/app/config.py b/app/config.py index ea719dd..f1ab31c 100644 --- a/app/config.py +++ b/app/config.py @@ -1,9 +1,10 @@ import os from datetime import timedelta + class Config: """Base configuration for Flask app""" - JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "") + JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "") SWAGGER_URL = os.getenv("SWAGGER_URL", "/documentation") API_URL = os.getenv("API_URL", "/swagger.json") @@ -14,24 +15,24 @@ class Config: THIS_SITE_URL = os.getenv("THIS_SITE_URL", "https://qa-panel.mermsemr.com") - OPENAI_API_KEY = os.getenv("OPENAI_API_KEY","qOLBHLMpSTfFrG9TEwA") + OPENAI_API_KEY = os.getenv("OPENAI_API_KEY", "qOLBHLMpSTfFrG9TEwA") - #Email Server - SEND_EMAIL_FROM = os.environ.get("SEND_EMAIL_FROM","message@chiefsoft.com") - SEND_EMAIL_PASS = os.environ.get("SEND_EMAIL_PASS","may12002!") + # Email Server + SEND_EMAIL_FROM = os.environ.get("SEND_EMAIL_FROM", "message@chiefsoft.com") + SEND_EMAIL_PASS = os.environ.get("SEND_EMAIL_PASS", "may12002!") # Database Configuration - DATABASE_USER = os.environ.get("DATABASE_USER","merms_panel") - DATABASE_PASSWORD = os.environ.get("DATABASE_PASSWORD","merms_panel") - DATABASE_HOST = os.environ.get("DATABASE_HOST","10.20.30.60") + DATABASE_USER = os.environ.get("DATABASE_USER", "merms_panel") + DATABASE_PASSWORD = os.environ.get("DATABASE_PASSWORD", "merms_panel") + DATABASE_HOST = os.environ.get("DATABASE_HOST", "10.20.30.60") DATABASE_PORT = os.environ.get("DATABASE_PORT", 5432) - DATABASE_NAME = os.environ.get("DATABASE_NAME","merms_panel") + DATABASE_NAME = os.environ.get("DATABASE_NAME", "merms_panel") # Database Connection SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" SQLALCHEMY_TRACK_MODIFICATIONS = False - START_URL_PATTERN = os.environ.get("START_URL_PATTERN",".devprov.mermsemr.com") + START_URL_PATTERN = os.environ.get("START_URL_PATTERN", ".devprov.mermsemr.com") JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "secret-key") JWT_ACCESS_TOKEN_EXPIRES = os.getenv("JWT_ACCESS_TOKEN_EXPIRES", timedelta(hours=1)) @@ -44,13 +45,13 @@ class Config: # KAFKA_BROKER = 'dev-events.simbrellang.net:9085' KAFKA_BROKER = os.getenv("KAFKA_BROKER", "10.10.10.120:9092") - STRIPE_SUCCESS_URL = os.environ.get("STRIPE_SUCCESS_URL","https://qa-panel.mermsemr.com/subscription-success?session_id={CHECKOUT_SESSION_ID}") - STRIPE_CANCEL_URL = os.environ.get("STRIPE_CANCEL_URL","https://qa-panel.mermsemr.com/subscriptio") + STRIPE_SUCCESS_URL = os.environ.get("STRIPE_SUCCESS_URL", + "https://qa-panel.mermsemr.com/subscription-success?session_id={CHECKOUT_SESSION_ID}") + STRIPE_CANCEL_URL = os.environ.get("STRIPE_CANCEL_URL", "https://qa-panel.mermsemr.com/subscriptio") VALID_APP_ID = os.getenv("SIMBRELLA_APP_ID", "app1") VALID_API_KEY = os.getenv("SIMBRELLA_API_KEY", "test-api-key-12345") - # SIMBRELLA_BASE_URL = os.getenv("SIMBRELLA_BASE_URL", "http://127.0.0.1:6337") # SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/rac-check") # SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS", "RACCheck") @@ -82,7 +83,7 @@ class Config: # "rule14_no_lien", # "rule15_null_ignore" # ] - + # rac_false_rules = [ # # ] @@ -98,7 +99,13 @@ class Config: STRIPE_PRIV_KEY = os.getenv("STRIPE_PRIV_KEY", "WRONG_KEY_SUPPLIED") - UPLOAD_FOLDER=os.environ.get("UPLOAD_FOLDER", "/app/uploads/DEV") + UPLOAD_FOLDER = os.environ.get("UPLOAD_FOLDER", "/app/uploads/DEV") MEDIA_SERVER = os.environ.get("MEDIA_SERVER", "https://media.mermsemr.com") + CACHE_SERVER = os.environ.get("CACHE_SERVER", "10.10.33.35") + CACHE_PORT = os.environ.get("CACHE_PORT", 6378) + CACHE_PASSWORD = os.environ.get("CACHE_PASSWORD", + "7f079034e166ecf52d82cbec9876e4dc8a154b0c37248f3fa1734d4eeab938d5") + + settings = Config()