ruff

Author: networkandcode

structured-kb-demo/arns.py

@@ -4,7 +4,6 @@
     GLUE_CRAWLER_IAM_POLICY,
     GLUE_CRAWLER_IAM_ROLE,
     REDSHIFT_IAM_ROLE,
-    REDSHIFT_WORKGROUP,
     BEDROCK_KB_IAM_POLICY,
     BEDROCK_KB_IAM_ROLE,
     AWS_REGION,

structured-kb-demo/pyproject.toml

@@ -10,3 +10,8 @@ dependencies = [
     "langgraph>=1.1.10",
     "python-dotenv>=1.2.2",
 ]
+
+[dependency-groups]
+dev = [
+    "ruff>=0.15.12",
+]

structured-kb-demo/run_glue_crawler.py

@@ -10,7 +10,7 @@ def run_glue_crawler(crawler_name):
 
     try:
         glue.start_crawler(Name=crawler_name)
-        logger.info(f"Crawler started.")
+        logger.info("Crawler started.")
 
         while True:
             response = glue.get_crawler(Name=crawler_name)
@@ -27,7 +27,7 @@ def run_glue_crawler(crawler_name):
                 break
 
     except glue.exceptions.CrawlerRunningException:
-        logger.warning(f"Crawler is already running.")
+        logger.warning("Crawler is already running.")
     except Exception as e:
         logger.error(f"Error: {str(e)}")
 

structured-kb-demo/setup_bedrock_kb_iam_policy.py

@@ -4,7 +4,7 @@
 from arns import S3_BUCKET_ARN
 from get_redshift_wg_arn import REDSHIFT_WORKGROUP_ARN
 from logger import logger
-from vars import AWS_ACCOUNT_ID, AWS_REGION, BEDROCK_KB_IAM_POLICY, GLUE_DB, S3_BUCKET, S3_FOLDER
+from vars import AWS_ACCOUNT_ID, AWS_REGION, BEDROCK_KB_IAM_POLICY, GLUE_DB, S3_FOLDER
 
 GLUE_TABLE = S3_FOLDER
 iam = boto3.client("iam")
@@ -105,10 +105,10 @@
         Description="Permissions for Bedrock Structured KB to query Redshift Serverless."
     )
 
-    logger.info(f"Successfully created policy!")
+    logger.info("Successfully created policy!")
 
 except iam.exceptions.EntityAlreadyExistsException:
-    logger.info(f"Policy already exists, updating it.")
+    logger.info("Policy already exists, updating it.")
     # Get the policy ARN
     policies = iam.list_policies(Scope='Local')
     policy_arn = next(p['Arn'] for p in policies['Policies'] if p['PolicyName'] == BEDROCK_KB_IAM_POLICY)
@@ -119,6 +119,6 @@
         PolicyDocument=json.dumps(policy_document),
         SetAsDefault=True
     )
-    logger.info(f"Successfully updated policy!")
+    logger.info("Successfully updated policy!")
 except Exception as e:
     logger.error(f"An error occurred: {e}")

structured-kb-demo/setup_bedrock_kb_iam_role.py

@@ -41,7 +41,7 @@
         RoleName=BEDROCK_KB_IAM_ROLE,
         PolicyArn=BEDROCK_KB_IAM_POLICY_ARN
     )
-    logger.info(f"Attached IAM policy to BedrockKB IAM role.")
+    logger.info("Attached IAM policy to BedrockKB IAM role.")
 
 except iam.exceptions.EntityAlreadyExistsException:
     logger.warning(f"Role {BEDROCK_KB_IAM_ROLE} already exists.")

structured-kb-demo/setup_bedrock_kb_user_on_redshift.py

@@ -3,7 +3,7 @@
 import boto3
 
 from logger import logger
-from vars import AWS_REGION, BEDROCK_KB_IAM_ROLE, GLUE_DB, REDSHIFT_WORKGROUP
+from vars import AWS_REGION, BEDROCK_KB_IAM_ROLE, REDSHIFT_WORKGROUP
 
 redshift_user = f"IAMR:{BEDROCK_KB_IAM_ROLE}"
 
@@ -13,7 +13,7 @@
 # Define the SQL commands
 sql_statements = [
     f'CREATE USER "{redshift_user}" WITH PASSWORD DISABLE;',
-    f'GRANT USAGE ON DATABASE awsdatacatalog TO "IAMR:StructKbIamRole";',
+    'GRANT USAGE ON DATABASE awsdatacatalog TO "IAMR:StructKbIamRole";',
 ]
 
 try:

structured-kb-demo/setup_glue_crawler_iam_policy.py

@@ -43,18 +43,18 @@
         PolicyDocument=json.dumps(policy_document),
         Description='Permissions for Glue Crawler to crawl S3 and use SQS Events'
     )
-    logger.info(f"Policy created successfully!")
+    logger.info("Policy created successfully!")
 
 except iam.exceptions.EntityAlreadyExistsException:
-    logger.info(f"Policy already exists. Updating...")
+    logger.info("Policy already exists. Updating...")
     try:
         # Create a new policy version
         iam.create_policy_version(
             PolicyArn=GLUE_CRAWLER_IAM_POLICY_ARN,
             PolicyDocument=json.dumps(policy_document),
             SetAsDefault=True
         )
-        logger.info(f"Policy updated successfully!")
+        logger.info("Policy updated successfully!")
     except Exception as e:
         logger.error(f"Error updating policy: {e}")
 

structured-kb-demo/setup_glue_crawler_iam_role.py

@@ -31,9 +31,9 @@
         RoleName=GLUE_CRAWLER_IAM_ROLE,
         AssumeRolePolicyDocument=json.dumps(trust_policy)
     )
-    logger.info(f"Created role")
+    logger.info("Created role")
 except iam.exceptions.EntityAlreadyExistsException:
-    logger.info(f"Role already exists.")
+    logger.info("Role already exists.")
 
 
 # Get existing attached policies

structured-kb-demo/setup_glue_db.py

@@ -12,9 +12,9 @@
             'Description': 'Database for Bedrock structured knowledge base demo',
         }
     )
-    logger.info(f"Glue database created successfully.")
+    logger.info("Glue database created successfully.")
 
 except glue.exceptions.AlreadyExistsException:
-    logger.error(f"Database already exists.")
+    logger.error("Database already exists.")
 except Exception as e:
     logger.error(f"Error creating Glue database: {e}")

structured-kb-demo/setup_s3_event_notification.py

@@ -23,6 +23,6 @@
         Bucket=S3_BUCKET,
         NotificationConfiguration=notification_configuration
     )
-    logger.info(f"Successfully added event notifications")
+    logger.info("Successfully added event notifications")
 except Exception as e:
     logger.error(f"Error: {e}")