Skip to content

Commit 87ed509

Browse files
tonyqiu123tonyqiu123
committed
ran linter
1 parent 1f66dda commit 87ed509

17 files changed

+139
-144
lines changed

‎backend/example/embedding_utils.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
import os
22
import sys
3-
from typing import List
43

54
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
65
from django.db import connection
76

87
from services.openai_service import generate_embedding
98

109

11-
def generate_event_embedding(event_data: dict) -> List[float]:
10+
def generate_event_embedding(event_data: dict) -> list[float]:
1211
return generate_embedding(repr(event_data))
1312

1413

1514
def find_similar_events(
16-
embedding: List[float], threshold: float = 0.985, limit: int = None
17-
) -> List[dict]:
15+
embedding: list[float], threshold: float = 0.985, limit: int = None
16+
) -> list[dict]:
1817
with connection.cursor() as cursor:
1918
if limit is not None:
2019
cursor.execute(

‎backend/example/migrations/0009_populate_embeddings.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 4.2.7 on 2025-09-21 15:20
22

33
from django.db import migrations
4+
45
from example.embedding_utils import generate_event_embedding
56

67

‎backend/example/migrations/0010_repopulate_embeddings.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 4.2.7 on 2025-09-24 00:00
22

33
from django.db import migrations
4+
45
from example.embedding_utils import generate_event_embedding
56

67

‎backend/example/migrations/0011_regenerate_embeddings_simple.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 4.2.7 on 2025-09-24 00:15
22

33
from django.db import migrations
4+
45
from example.embedding_utils import generate_event_embedding
56

67

‎backend/example/migrations/0012_events_added_at_events_embedding.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated by Django 4.2.7 on 2025-09-24 20:33
22

3-
from django.db import migrations, models
43
import pgvector.django.vector
4+
from django.db import migrations, models
55

66

77
class Migration(migrations.Migration):

‎backend/example/migrations/0014_update_null_embeddings.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 4.2.7 on 2025-09-25 18:38
22

33
from django.db import migrations
4+
45
from example.embedding_utils import generate_event_embedding
56

67

‎backend/example/models.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from django.db import models
2-
32
from pgvector.django import VectorField
43

54

‎backend/example/views.py‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from django.contrib.auth.models import User
99
from django.db import connection
1010
from django.db.models import OuterRef, Subquery
11-
1211
from pytz import timezone
1312
from rest_framework import status
1413
from rest_framework.authtoken.models import Token
@@ -25,7 +24,7 @@
2524

2625
@api_view(["GET"])
2726
@permission_classes([AllowAny])
28-
def home(request):
27+
def home(_request):
2928
"""Home endpoint with basic info"""
3029
return Response(
3130
{
@@ -35,15 +34,23 @@ def home(request):
3534
"GET /api/events/?view=calendar": "Get events in calendar view",
3635
"GET /api/clubs/": "Get all clubs from database",
3736
"GET /api/health/": "Health check",
38-
"POST /api/mock-event/": "Create a mock event with vector embedding (admin only)",
39-
"GET /api/test-similarity/?text=search_text": "Test vector similarity search",
37+
"POST /api/mock-event/": (
38+
"Create a mock event with vector embedding (admin only)"
39+
),
40+
"GET /api/test-similarity/?text=search_text": (
41+
"Test vector similarity search"
42+
),
4043
"POST /api/auth/register/": "Register a new user account",
41-
"POST /api/auth/token/": "Get authentication token with username/password",
44+
"POST /api/auth/token/": (
45+
"Get authentication token with username/password"
46+
),
4247
},
4348
"auth": {
4449
"info": "POST routes (except auth endpoints) require admin privileges",
4550
"header": "Authorization: Token <admin-token>",
46-
"admin_note": "Only admin users can access POST endpoints like /api/mock-event/",
51+
"admin_note": (
52+
"Only admin users can access POST endpoints like /api/mock-event/"
53+
),
4754
"register_example": {
4855
"username": "your_username",
4956
"password": "your_password",
@@ -53,15 +60,17 @@ def home(request):
5360
"username": "your_username",
5461
"password": "your_password",
5562
},
56-
"make_admin": "Use Django admin or manage.py createsuperuser to create admin users",
63+
"make_admin": (
64+
"Use Django admin or manage.py createsuperuser to create admin users"
65+
),
5766
},
5867
}
5968
)
6069

6170

6271
@api_view(["GET"])
6372
@permission_classes([AllowAny])
64-
def health(request):
73+
def health(_request):
6574
"""Health check endpoint"""
6675
return Response({"status": "healthy", "message": "Server is running"})
6776

@@ -189,7 +198,9 @@ def create_mock_event(request):
189198
if similar_events:
190199
return Response(
191200
{
192-
"message": "Duplicate event detected! A similar event already exists.",
201+
"message": (
202+
"Duplicate event detected! A similar event already exists."
203+
),
193204
"event_data": event_data,
194205
"similar_event": similar_events[0],
195206
},
@@ -201,7 +212,7 @@ def create_mock_event(request):
201212
cursor.execute(
202213
"""
203214
INSERT INTO events (
204-
club_handle, url, name, date, start_time, end_time,
215+
club_handle, url, name, date, start_time, end_time,
205216
location, price, food, registration, image_url, embedding
206217
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s::vector)
207218
RETURNING id
@@ -236,7 +247,7 @@ def create_mock_event(request):
236247

237248
except Exception as e:
238249
return Response(
239-
{"error": f"Failed to create mock event: {str(e)}"},
250+
{"error": f"Failed to create mock event: {e!s}"},
240251
status=status.HTTP_500_INTERNAL_SERVER_ERROR,
241252
)
242253

@@ -276,7 +287,7 @@ def test_similarity(request):
276287

277288
except Exception as e:
278289
return Response(
279-
{"error": f"Failed to test similarity: {str(e)}"},
290+
{"error": f"Failed to test similarity: {e!s}"},
280291
status=status.HTTP_500_INTERNAL_SERVER_ERROR,
281292
)
282293

@@ -317,7 +328,7 @@ def create_auth_token(request):
317328

318329
except Exception as e:
319330
return Response(
320-
{"error": f"Failed to create token: {str(e)}"},
331+
{"error": f"Failed to create token: {e!s}"},
321332
status=status.HTTP_500_INTERNAL_SERVER_ERROR,
322333
)
323334

@@ -362,6 +373,6 @@ def create_user(request):
362373

363374
except Exception as e:
364375
return Response(
365-
{"error": f"Failed to create user: {str(e)}"},
376+
{"error": f"Failed to create user: {e!s}"},
366377
status=status.HTTP_500_INTERNAL_SERVER_ERROR,
367378
)

‎backend/manage.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ def main():
1111
try:
1212
from django.core.management import execute_from_command_line
1313
except ImportError as exc:
14-
raise ImportError(
14+
msg = (
1515
"Couldn't import Django. Are you sure it's installed and "
1616
"available on your PYTHONPATH environment variable? Did you "
1717
"forget to activate a virtual environment?"
18-
) from exc
18+
)
19+
raise ImportError(msg) from exc
1920
execute_from_command_line(sys.argv)
2021

2122

‎backend/pyproject.toml‎

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,14 @@
11
[tool.ruff]
22
line-length = 88
3-
target-version = "py311"
3+
target-version = "py310"
44

55
[tool.ruff.lint]
6-
# Enable the same rules as your previous flake8 setup
7-
select = [
8-
"E", # pycodestyle errors
9-
"W", # pycodestyle warnings
10-
"F", # Pyflakes
11-
"I", # isort
12-
]
6+
select = ["E", "W", "F", "I", "N", "UP", "B", "A", "C4", "T20", "SIM", "ARG", "PTH", "ERA", "PD", "PGH", "PL", "TRY", "FLY", "NPY", "AIR", "PERF", "FURB", "LOG", "RUF"]
7+
ignore = ["T201", "TRY300", "TRY400", "RUF012", "ARG001", "E501", "W293", "PTH118", "PTH120", "PTH100", "PTH123", "PLR0912", "PLR0915", "B008", "N806", "PLR2004", "B007", "PERF102", "ERA001", "C414", "RUF013", "W291"]
138

14-
# Ignore rules (Ruff uses different codes than flake8)
15-
ignore = [
16-
"E203", # whitespace before ':' (conflicts with formatter)
17-
"E501", # line too long (handled by formatter)
18-
"W291", # trailing whitespace
19-
"W292", # no newline at end of file
20-
"W293", # blank line contains whitespace
21-
]
22-
23-
# Per-file ignores (same as your .flake8 setup)
249
[tool.ruff.lint.per-file-ignores]
25-
"__init__.py" = ["F401"] # Allow unused imports in __init__.py
26-
"*/migrations/*" = ["E", "W", "F", "I"] # Ignore all rules in migrations
27-
"*/embedding_utils.py" = ["E402"] # Allow imports not at top (Django setup)
28-
"*/instagram_feed.py" = ["E402"] # Allow imports not at top (Django setup)
29-
30-
[tool.ruff.lint.isort]
31-
# Configure import sorting (same as your previous isort setup)
32-
known-first-party = ["api", "example", "services", "scraping"]
33-
known-third-party = ["django"]
34-
section-order = ["future", "standard-library", "django", "third-party", "first-party", "local-folder"]
35-
36-
[tool.ruff.lint.isort.sections]
37-
django = ["django"]
38-
39-
[tool.ruff.format]
40-
# Use Black-compatible formatting
41-
quote-style = "double"
42-
indent-style = "space"
43-
line-ending = "auto"
10+
"scripts/s3_cleanup.py" = ["E402"]
11+
"scraping/instagram_feed.py" = ["E402", "E501", "PTH100", "PTH120"]
12+
"example/migrations/*.py" = ["T201", "ARG001", "RUF012", "W291", "PERF203"]
13+
"manage.py" = ["TRY003"]
14+
"test_openai_service.py" = ["T201", "E501"]

0 commit comments

Comments
 (0)