Skip to content

Commit cf9e870

Browse files
committed
pre commit run
1 parent a68b616 commit cf9e870

26 files changed

+221
-108
lines changed

backend/app/api/routes/api_keys.py

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,17 @@ def create_key(
2828
"""
2929
Generate a new API key for the user's organization.
3030
"""
31-
logger.info(f"[apikey.create] Received create API key request | project_id={project_id}, user_id={user_id}")
31+
logger.info(
32+
f"[apikey.create] Received create API key request | project_id={project_id}, user_id={user_id}"
33+
)
3234

3335
project = validate_project(session, project_id)
3436

3537
existing_api_key = get_api_key_by_project_user(session, project_id, user_id)
3638
if existing_api_key:
37-
logger.warning(f"[apikey.create] API key already exists | project_id={project_id}, user_id={user_id}")
39+
logger.warning(
40+
f"[apikey.create] API key already exists | project_id={project_id}, user_id={user_id}"
41+
)
3842
raise HTTPException(
3943
status_code=400,
4044
detail="API Key already exists for this user and project.",
@@ -47,7 +51,9 @@ def create_key(
4751
project_id=project_id,
4852
)
4953

50-
logger.info(f"[apikey.create] Created API key | api_key_id={api_key.id}, project_id={project_id}, user_id={user_id}")
54+
logger.info(
55+
f"[apikey.create] Created API key | api_key_id={api_key.id}, project_id={project_id}, user_id={user_id}"
56+
)
5157
return APIResponse.success_response(api_key)
5258

5359

@@ -61,13 +67,17 @@ def list_keys(
6167
Retrieve all API keys for the given project. Superusers get all keys;
6268
regular users get only their own.
6369
"""
64-
logger.info(f"[apikey.list] Fetching API keys | project_id={project_id}, requested_by_user_id={current_user.id}")
70+
logger.info(
71+
f"[apikey.list] Fetching API keys | project_id={project_id}, requested_by_user_id={current_user.id}"
72+
)
6573

6674
project = validate_project(session=session, project_id=project_id)
6775

6876
if current_user.is_superuser:
6977
api_keys = get_api_keys_by_project(session=session, project_id=project_id)
70-
logger.info(f"[apikey.list] Superuser access - {len(api_keys)} key(s) found | project_id={project_id}")
78+
logger.info(
79+
f"[apikey.list] Superuser access - {len(api_keys)} key(s) found | project_id={project_id}"
80+
)
7181
else:
7282
user_api_key = get_api_key_by_project_user(
7383
session=session, project_id=project_id, user_id=current_user.id
@@ -81,7 +91,9 @@ def list_keys(
8191
detail="No API keys found for this project.",
8292
)
8393

84-
logger.info(f"[apikey.list] Found API key | project_id={project_id}, requested_by_user_id={current_user.id}")
94+
logger.info(
95+
f"[apikey.list] Found API key | project_id={project_id}, requested_by_user_id={current_user.id}"
96+
)
8597
return APIResponse.success_response(api_keys)
8698

8799

@@ -94,7 +106,9 @@ def get_key(
94106
"""
95107
Retrieve an API key by ID.
96108
"""
97-
logger.info(f"[apikey.get] Fetching API key | api_key_id={api_key_id}, requested_by_user_id={current_user.id}")
109+
logger.info(
110+
f"[apikey.get] Fetching API key | api_key_id={api_key_id}, requested_by_user_id={current_user.id}"
111+
)
98112

99113
api_key = get_api_key(session, api_key_id)
100114
if not api_key:
@@ -114,11 +128,15 @@ def revoke_key(
114128
"""
115129
Soft delete an API key (revoke access).
116130
"""
117-
logger.info(f"[apikey.revoke] Revoking API key | api_key_id={api_key_id}, requested_by_user_id={current_user.id}")
131+
logger.info(
132+
f"[apikey.revoke] Revoking API key | api_key_id={api_key_id}, requested_by_user_id={current_user.id}"
133+
)
118134

119135
api_key = get_api_key(session, api_key_id)
120136
if not api_key:
121-
logger.warning(f"[apikey.revoke] API key not found or already deleted | api_key_id={api_key_id}")
137+
logger.warning(
138+
f"[apikey.revoke] API key not found or already deleted | api_key_id={api_key_id}"
139+
)
122140
raise HTTPException(404, "API key not found or already deleted")
123141

124142
delete_api_key(session, api_key_id)

backend/app/api/routes/collections.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ def __call__(self, response: APIResponse, status: str):
173173
post_callback(self.url, response)
174174

175175
def fail(self, body):
176-
logger.error(
177-
f"[WebHookCallback.fail] Callback failed | {{'body': '{body}'}}"
178-
)
176+
logger.error(f"[WebHookCallback.fail] Callback failed | {{'body': '{body}'}}")
179177
self(APIResponse.failure_response(body), "incomplete")
180178

181179
def success(self, body):
@@ -459,4 +457,4 @@ def collection_documents(
459457
logger.info(
460458
f"[collection_documents] Documents retrieved successfully | {{'collection_id': '{collection_id}', 'document_count': {len(data)}}}"
461459
)
462-
return APIResponse.success_response(data)
460+
return APIResponse.success_response(data)

backend/app/api/routes/credentials.py

Lines changed: 61 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,20 @@
3232
description="Creates new credentials for a specific organization and project combination. This endpoint requires superuser privileges. Each organization can have different credentials for different providers and projects. Only one credential per provider is allowed per organization-project combination.",
3333
)
3434
def create_new_credential(*, session: SessionDep, creds_in: CredsCreate):
35-
logger.info(f"[credential.create] Creating credentials | org_id={creds_in.organization_id}, project_id={creds_in.project_id}")
36-
35+
logger.info(
36+
f"[credential.create] Creating credentials | org_id={creds_in.organization_id}, project_id={creds_in.project_id}"
37+
)
38+
3739
# Validate organization
3840
validate_organization(session, creds_in.organization_id)
3941

4042
# Validate project if provided
4143
if creds_in.project_id:
4244
project = validate_project(session, creds_in.project_id)
4345
if project.organization_id != creds_in.organization_id:
44-
logger.warning(f"[credential.create] Project does not belong to organization | org_id={creds_in.organization_id}, project_id={creds_in.project_id}")
46+
logger.warning(
47+
f"[credential.create] Project does not belong to organization | org_id={creds_in.organization_id}, project_id={creds_in.project_id}"
48+
)
4549
raise HTTPException(
4650
status_code=400,
4751
detail="Project does not belong to the specified organization",
@@ -56,7 +60,9 @@ def create_new_credential(*, session: SessionDep, creds_in: CredsCreate):
5660
project_id=creds_in.project_id,
5761
)
5862
if existing_cred:
59-
logger.warning(f"[credential.create] Credential exists | provider={provider}, org_id={creds_in.organization_id}, project_id={creds_in.project_id}")
63+
logger.warning(
64+
f"[credential.create] Credential exists | provider={provider}, org_id={creds_in.organization_id}, project_id={creds_in.project_id}"
65+
)
6066
raise HTTPException(
6167
status_code=400,
6268
detail=(
@@ -68,10 +74,14 @@ def create_new_credential(*, session: SessionDep, creds_in: CredsCreate):
6874
# Create credentials
6975
new_creds = set_creds_for_org(session=session, creds_add=creds_in)
7076
if not new_creds:
71-
logger.error(f"[credential.create] Failed to create credentials | org_id={creds_in.organization_id}")
77+
logger.error(
78+
f"[credential.create] Failed to create credentials | org_id={creds_in.organization_id}"
79+
)
7280
raise Exception(status_code=500, detail="Failed to create credentials")
7381

74-
logger.info(f"[credential.create] Credentials created | count={len(new_creds)}, org_id={creds_in.organization_id}")
82+
logger.info(
83+
f"[credential.create] Credentials created | count={len(new_creds)}, org_id={creds_in.organization_id}"
84+
)
7585
return APIResponse.success_response([cred.to_public() for cred in new_creds])
7686

7787

@@ -83,13 +93,19 @@ def create_new_credential(*, session: SessionDep, creds_in: CredsCreate):
8393
description="Retrieves all provider credentials associated with a specific organization and project combination. If project_id is not provided, returns credentials for the organization level. This endpoint requires superuser privileges.",
8494
)
8595
def read_credential(*, session: SessionDep, org_id: int, project_id: int | None = None):
86-
logger.info(f"[credential.read] Fetching credentials | org_id={org_id}, project_id={project_id}")
96+
logger.info(
97+
f"[credential.read] Fetching credentials | org_id={org_id}, project_id={project_id}"
98+
)
8799
creds = get_creds_by_org(session=session, org_id=org_id, project_id=project_id)
88100
if not creds:
89-
logger.warning(f"[credential.read] No credentials found | org_id={org_id}, project_id={project_id}")
101+
logger.warning(
102+
f"[credential.read] No credentials found | org_id={org_id}, project_id={project_id}"
103+
)
90104
raise HTTPException(status_code=404, detail="Credentials not found")
91105

92-
logger.info(f"[credential.read] Retrieved {len(creds)} credentials | org_id={org_id}, project_id={project_id}")
106+
logger.info(
107+
f"[credential.read] Retrieved {len(creds)} credentials | org_id={org_id}, project_id={project_id}"
108+
)
93109
return APIResponse.success_response([cred.to_public() for cred in creds])
94110

95111

@@ -103,7 +119,9 @@ def read_credential(*, session: SessionDep, org_id: int, project_id: int | None
103119
def read_provider_credential(
104120
*, session: SessionDep, org_id: int, provider: str, project_id: int | None = None
105121
):
106-
logger.info(f"[credential.read_provider] Fetching provider credential | org_id={org_id}, provider={provider}, project_id={project_id}")
122+
logger.info(
123+
f"[credential.read_provider] Fetching provider credential | org_id={org_id}, provider={provider}, project_id={project_id}"
124+
)
107125
provider_enum = validate_provider(provider)
108126
provider_creds = get_provider_credential(
109127
session=session,
@@ -112,10 +130,14 @@ def read_provider_credential(
112130
project_id=project_id,
113131
)
114132
if provider_creds is None:
115-
logger.warning(f"[credential.read_provider] Credential not found | org_id={org_id}, provider={provider}, project_id={project_id}")
133+
logger.warning(
134+
f"[credential.read_provider] Credential not found | org_id={org_id}, provider={provider}, project_id={project_id}"
135+
)
116136
raise HTTPException(status_code=404, detail="Provider credentials not found")
117137

118-
logger.info(f"[credential.read_provider] Credential found | org_id={org_id}, provider={provider}, project_id={project_id}")
138+
logger.info(
139+
f"[credential.read_provider] Credential found | org_id={org_id}, provider={provider}, project_id={project_id}"
140+
)
119141
return APIResponse.success_response(provider_creds)
120142

121143

@@ -127,7 +149,9 @@ def read_provider_credential(
127149
description="Updates credentials for a specific organization and project combination. Can update specific provider credentials or add new providers. If project_id is provided in the update, credentials will be moved to that project. This endpoint requires superuser privileges.",
128150
)
129151
def update_credential(*, session: SessionDep, org_id: int, creds_in: CredsUpdate):
130-
logger.info(f"[credential.update] Updating credentials | org_id={org_id}, provider={creds_in.provider}, project_id={creds_in.project_id}")
152+
logger.info(
153+
f"[credential.update] Updating credentials | org_id={org_id}, provider={creds_in.provider}, project_id={creds_in.project_id}"
154+
)
131155
validate_organization(session, org_id)
132156
if not creds_in or not creds_in.provider or not creds_in.credential:
133157
logger.warning(f"[credential.update] Invalid update payload | org_id={org_id}")
@@ -139,7 +163,9 @@ def update_credential(*, session: SessionDep, org_id: int, creds_in: CredsUpdate
139163
session=session, org_id=org_id, creds_in=creds_in
140164
)
141165

142-
logger.info(f"[credential.update] Credentials updated | count={len(updated_creds)}, org_id={org_id}, provider={creds_in.provider}")
166+
logger.info(
167+
f"[credential.update] Credentials updated | count={len(updated_creds)}, org_id={org_id}, provider={creds_in.provider}"
168+
)
143169
return APIResponse.success_response([cred.to_public() for cred in updated_creds])
144170

145171

@@ -152,10 +178,14 @@ def update_credential(*, session: SessionDep, org_id: int, creds_in: CredsUpdate
152178
def delete_provider_credential(
153179
*, session: SessionDep, org_id: int, provider: str, project_id: int | None = None
154180
):
155-
logger.info(f"[credential.delete_provider] Deleting provider credential | org_id={org_id}, provider={provider}, project_id={project_id}")
181+
logger.info(
182+
f"[credential.delete_provider] Deleting provider credential | org_id={org_id}, provider={provider}, project_id={project_id}"
183+
)
156184
provider_enum = validate_provider(provider)
157185
if not provider_enum:
158-
logger.warning(f"[credential.delete_provider] Invalid provider | provider={provider}")
186+
logger.warning(
187+
f"[credential.delete_provider] Invalid provider | provider={provider}"
188+
)
159189
raise HTTPException(status_code=400, detail="Invalid provider")
160190

161191
provider_creds = get_provider_credential(
@@ -165,14 +195,18 @@ def delete_provider_credential(
165195
project_id=project_id,
166196
)
167197
if provider_creds is None:
168-
logger.warning(f"[credential.delete_provider] Credential not found | org_id={org_id}, provider={provider}, project_id={project_id}")
198+
logger.warning(
199+
f"[credential.delete_provider] Credential not found | org_id={org_id}, provider={provider}, project_id={project_id}"
200+
)
169201
raise HTTPException(status_code=404, detail="Provider credentials not found")
170202

171203
updated_creds = remove_provider_credential(
172204
session=session, org_id=org_id, provider=provider_enum, project_id=project_id
173205
)
174206

175-
logger.info(f"[credential.delete_provider] Credential deleted | org_id={org_id}, provider={provider}, project_id={project_id}")
207+
logger.info(
208+
f"[credential.delete_provider] Credential deleted | org_id={org_id}, provider={provider}, project_id={project_id}"
209+
)
176210
return APIResponse.success_response(
177211
{"message": "Provider credentials removed successfully"}
178212
)
@@ -188,13 +222,19 @@ def delete_provider_credential(
188222
def delete_all_credentials(
189223
*, session: SessionDep, org_id: int, project_id: int | None = None
190224
):
191-
logger.info(f"[credential.delete_all] Deleting all credentials | org_id={org_id}, project_id={project_id}")
225+
logger.info(
226+
f"[credential.delete_all] Deleting all credentials | org_id={org_id}, project_id={project_id}"
227+
)
192228
creds = remove_creds_for_org(session=session, org_id=org_id, project_id=project_id)
193229
if not creds:
194-
logger.warning(f"[credential.delete_all] No credentials found to delete | org_id={org_id}, project_id={project_id}")
230+
logger.warning(
231+
f"[credential.delete_all] No credentials found to delete | org_id={org_id}, project_id={project_id}"
232+
)
195233
raise HTTPException(
196234
status_code=404, detail="Credentials for organization not found"
197235
)
198236

199-
logger.info(f"[credential.delete_all] All credentials deleted | org_id={org_id}, project_id={project_id}")
237+
logger.info(
238+
f"[credential.delete_all] All credentials deleted | org_id={org_id}, project_id={project_id}"
239+
)
200240
return APIResponse.success_response({"message": "Credentials deleted successfully"})

backend/app/api/routes/documents.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,4 @@ def doc_info(
148148
logger.info(
149149
f"[doc_info] Document retrieved successfully | {{'user_id': '{current_user.id}', 'document_id': '{doc_id}'}}"
150150
)
151-
return APIResponse.success_response(data)
151+
return APIResponse.success_response(data)

backend/app/api/routes/login.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,14 @@ def login_access_token(
4242
session=session, email=form_data.username, password=form_data.password
4343
)
4444
if not user:
45-
logger.warning(f"[login.access_token] Invalid credentials | email={form_data.username}")
45+
logger.warning(
46+
f"[login.access_token] Invalid credentials | email={form_data.username}"
47+
)
4648
raise HTTPException(status_code=400, detail="Incorrect email or password")
4749
elif not user.is_active:
48-
logger.warning(f"[login.access_token] Inactive user login attempt | user_id={user.id}")
50+
logger.warning(
51+
f"[login.access_token] Inactive user login attempt | user_id={user.id}"
52+
)
4953
raise HTTPException(status_code=400, detail="Inactive user")
5054

5155
access_token_expires = timedelta(minutes=token_expiry_minutes)
@@ -137,7 +141,9 @@ def recover_password_html_content(email: str, session: SessionDep) -> Any:
137141
"""
138142
HTML Content for Password Recovery
139143
"""
140-
logger.info(f"[login.recover_password_html] HTML recovery content requested | email={email}")
144+
logger.info(
145+
f"[login.recover_password_html] HTML recovery content requested | email={email}"
146+
)
141147

142148
user = get_user_by_email(session=session, email=email)
143149
if not user:
@@ -152,7 +158,9 @@ def recover_password_html_content(email: str, session: SessionDep) -> Any:
152158
email_to=user.email, email=email, token=password_reset_token
153159
)
154160

155-
logger.info(f"[login.recover_password_html] HTML content generated | user_id={user.id}")
161+
logger.info(
162+
f"[login.recover_password_html] HTML content generated | user_id={user.id}"
163+
)
156164
return HTMLResponse(
157165
content=email_data.html_content, headers={"subject:": email_data.subject}
158166
)

0 commit comments

Comments
 (0)