Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/models/challenge.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

from datetime import datetime
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Optional

from sqlalchemy import JSON, Boolean, DateTime, ForeignKey, Integer, String, Text, UniqueConstraint
from sqlalchemy.orm import Mapped, mapped_column, relationship
Expand All @@ -24,7 +24,7 @@ class Challenge(Base):
owasp_ref: Mapped[str] = mapped_column(String(20), nullable=False)
evaluator_key: Mapped[str] = mapped_column(String(100), nullable=False, default="")
hints: Mapped[list] = mapped_column(JSON, default=list, nullable=False)
target_route: Mapped[str | None] = mapped_column(String(255), nullable=True)
target_route: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
created_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), server_default=func.now(), nullable=False
Expand All @@ -49,9 +49,9 @@ class ChallengeAttempt(Base):
Integer, ForeignKey("challenges.id", ondelete="CASCADE"), nullable=False
)
exploit_triggered: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
exploit_timestamp: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
exploit_timestamp: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
started_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
completed_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
completed_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
points_awarded: Mapped[int] = mapped_column(Integer, default=0, nullable=False)

user: Mapped["User"] = relationship("User")
Expand Down
6 changes: 3 additions & 3 deletions app/models/coupon.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

from datetime import datetime
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Optional

from sqlalchemy import Boolean, DateTime, ForeignKey, Integer, Numeric, String, Text
from sqlalchemy.orm import Mapped, mapped_column, relationship
Expand All @@ -24,7 +24,7 @@ class Coupon(Base):
discount_type: Mapped[str] = mapped_column(String(10), default="percentage", nullable=False)
discount_value: Mapped[float] = mapped_column(Numeric(10, 2), nullable=False)
minimum_order_amount: Mapped[float] = mapped_column(Numeric(10, 2), default=0, nullable=False)
maximum_discount: Mapped[float | None] = mapped_column(Numeric(10, 2), nullable=True)
maximum_discount: Mapped[Optional[float]] = mapped_column(Numeric(10, 2), nullable=True)
usage_limit: Mapped[int] = mapped_column(Integer, default=1, nullable=False)
usage_limit_per_user: Mapped[int] = mapped_column(Integer, default=1, nullable=False)
target_audience: Mapped[str] = mapped_column(String(10), default="all", nullable=False)
Expand Down Expand Up @@ -53,7 +53,7 @@ class CouponUsage(Base):
user_id: Mapped[int] = mapped_column(
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False
)
order_id: Mapped[int | None] = mapped_column(
order_id: Mapped[Optional[int]] = mapped_column(
Integer, ForeignKey("orders.id", ondelete="CASCADE"), nullable=True
)
order_amount: Mapped[float] = mapped_column(Numeric(10, 2), nullable=False)
Expand Down
6 changes: 3 additions & 3 deletions app/models/knowledge.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

from datetime import datetime
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Optional

from sqlalchemy import JSON, Boolean, DateTime, ForeignKey, Integer, String, Text
from sqlalchemy.orm import Mapped, mapped_column, relationship
Expand All @@ -17,14 +17,14 @@ class KnowledgeBaseEntry(Base):
__tablename__ = "knowledge_base_entries"

id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
product_id: Mapped[int | None] = mapped_column(
product_id: Mapped[Optional[int]] = mapped_column(
Integer, ForeignKey("products.id", ondelete="CASCADE"), nullable=True
)
title: Mapped[str] = mapped_column(String(255), nullable=False)
content: Mapped[str] = mapped_column(Text, nullable=False)
category: Mapped[str] = mapped_column(String(100), nullable=False)
is_user_injected: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
embedding_id: Mapped[str | None] = mapped_column(String(255), nullable=True)
embedding_id: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
chunk_index: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
metadata_json: Mapped[dict] = mapped_column(JSON, default=dict, nullable=False)
created_at: Mapped[datetime] = mapped_column(
Expand Down
3 changes: 2 additions & 1 deletion app/models/lab.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations

from datetime import datetime
from typing import Optional

from sqlalchemy import DateTime, ForeignKey, Integer, String
from sqlalchemy.orm import Mapped, mapped_column
Expand All @@ -20,5 +21,5 @@ class LabSession(Base):
started_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), server_default=func.now(), nullable=False
)
completed_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
completed_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
reset_count: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
12 changes: 6 additions & 6 deletions app/models/order.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

from datetime import datetime
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Optional

from sqlalchemy import DateTime, ForeignKey, Integer, Numeric, String, Text
from sqlalchemy.orm import Mapped, mapped_column, relationship
Expand All @@ -23,11 +23,11 @@ class Order(Base):
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False
)
total_amount: Mapped[float] = mapped_column(Numeric(10, 2), nullable=False)
applied_coupon_id: Mapped[int | None] = mapped_column(
applied_coupon_id: Mapped[Optional[int]] = mapped_column(
Integer, ForeignKey("coupons.id", ondelete="SET NULL"), nullable=True
)
discount_amount: Mapped[float] = mapped_column(Numeric(10, 2), default=0, nullable=False)
final_amount: Mapped[float | None] = mapped_column(Numeric(10, 2), nullable=True)
final_amount: Mapped[Optional[float]] = mapped_column(Numeric(10, 2), nullable=True)
status: Mapped[str] = mapped_column(String(20), default="pending", nullable=False)
shipping_first_name: Mapped[str] = mapped_column(String(100), nullable=False, default="")
shipping_last_name: Mapped[str] = mapped_column(String(100), nullable=False, default="")
Expand Down Expand Up @@ -82,9 +82,9 @@ class Payment(Base):
order_id: Mapped[int] = mapped_column(
Integer, ForeignKey("orders.id", ondelete="CASCADE"), unique=True, nullable=False
)
card_number: Mapped[str | None] = mapped_column(String(20), nullable=True)
card_type: Mapped[str | None] = mapped_column(String(20), nullable=True)
amount: Mapped[float | None] = mapped_column(Numeric(10, 2), nullable=True)
card_number: Mapped[Optional[str]] = mapped_column(String(20), nullable=True)
card_type: Mapped[Optional[str]] = mapped_column(String(20), nullable=True)
amount: Mapped[Optional[float]] = mapped_column(Numeric(10, 2), nullable=True)
created_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), server_default=func.now(), nullable=False
)
Expand Down
6 changes: 3 additions & 3 deletions app/models/product.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

from datetime import datetime
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Optional

from sqlalchemy import JSON, Boolean, DateTime, Integer, Numeric, String, Text
from sqlalchemy.orm import Mapped, mapped_column, relationship
Expand All @@ -20,10 +20,10 @@ class Product(Base):
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
name: Mapped[str] = mapped_column(String(255), nullable=False)
description: Mapped[str] = mapped_column(Text, nullable=False)
detailed_description: Mapped[str | None] = mapped_column(Text, nullable=True)
detailed_description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
specifications: Mapped[dict] = mapped_column(JSON, default=dict, nullable=False)
price: Mapped[float] = mapped_column(Numeric(10, 2), nullable=False)
image: Mapped[str | None] = mapped_column(String(500), nullable=True)
image: Mapped[Optional[str]] = mapped_column(String(500), nullable=True)
quantity: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
is_sold_out: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
created_at: Mapped[datetime] = mapped_column(
Expand Down
7 changes: 4 additions & 3 deletions app/models/telemetry.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations

from datetime import datetime
from typing import Optional

from sqlalchemy import DateTime, ForeignKey, Integer, String, Text
from sqlalchemy.orm import Mapped, mapped_column
Expand All @@ -13,14 +14,14 @@ class DefenseTelemetry(Base):
__tablename__ = "defense_telemetry"

id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
user_id: Mapped[int | None] = mapped_column(
user_id: Mapped[Optional[int]] = mapped_column(
Integer, ForeignKey("users.id", ondelete="SET NULL"), nullable=True
)
defense_level: Mapped[int] = mapped_column(Integer, nullable=False)
message: Mapped[str] = mapped_column(Text, nullable=False)
intent_classification: Mapped[str | None] = mapped_column(String(100), nullable=True)
intent_classification: Mapped[Optional[str]] = mapped_column(String(100), nullable=True)
action: Mapped[str] = mapped_column(String(20), nullable=False)
response_time_ms: Mapped[int | None] = mapped_column(Integer, nullable=True)
response_time_ms: Mapped[Optional[int]] = mapped_column(Integer, nullable=True)
created_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), server_default=func.now(), nullable=False
)
4 changes: 2 additions & 2 deletions app/models/user.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

from datetime import datetime
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Optional

from sqlalchemy import Boolean, DateTime, ForeignKey, Integer, String, Text
from sqlalchemy.orm import Mapped, mapped_column, relationship
Expand Down Expand Up @@ -57,7 +57,7 @@ class UserProfile(Base):
state: Mapped[str] = mapped_column(String(50), nullable=False, default="")
zip_code: Mapped[str] = mapped_column(String(20), nullable=False, default="")
country: Mapped[str] = mapped_column(String(50), nullable=False, default="US")
profile_picture: Mapped[str | None] = mapped_column(String(500), nullable=True)
profile_picture: Mapped[Optional[str]] = mapped_column(String(500), nullable=True)
card_number: Mapped[str] = mapped_column(String(20), nullable=False, default="")
card_type: Mapped[str] = mapped_column(String(20), nullable=False, default="")
card_holder: Mapped[str] = mapped_column(String(100), nullable=False, default="")
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ httpx>=0.26.0
# Configuration
pyyaml>=6.0.1
pydantic>=2.5.0
eval-type-backport>=0.2.0

# AI / Embeddings
sentence-transformers>=2.3.0
Expand Down