```
chore: remove obsolete payment architecture and integration test documentation - Remove AITBC_PAYMENT_ARCHITECTURE.md (dual-currency system documentation) - Remove IMPLEMENTATION_COMPLETE_SUMMARY.md (integration test completion summary) - Remove INTEGRATION_TEST_FIXES.md (test fixes documentation) - Remove INTEGRATION_TEST_UPDATES.md (real features implementation notes) - Remove PAYMENT_INTEGRATION_COMPLETE.md (wallet-coordinator integration docs) - Remove WALLET_COORDINATOR_INTEGRATION.md (payment
This commit is contained in:
@@ -3,8 +3,9 @@
|
||||
from .job import Job
|
||||
from .miner import Miner
|
||||
from .job_receipt import JobReceipt
|
||||
from .marketplace import MarketplaceOffer, MarketplaceBid, OfferStatus
|
||||
from .marketplace import MarketplaceOffer, MarketplaceBid
|
||||
from .user import User, Wallet
|
||||
from .payment import JobPayment, PaymentEscrow
|
||||
|
||||
__all__ = [
|
||||
"Job",
|
||||
@@ -12,7 +13,8 @@ __all__ = [
|
||||
"JobReceipt",
|
||||
"MarketplaceOffer",
|
||||
"MarketplaceBid",
|
||||
"OfferStatus",
|
||||
"User",
|
||||
"Wallet",
|
||||
"JobPayment",
|
||||
"PaymentEscrow",
|
||||
]
|
||||
|
||||
@@ -4,17 +4,18 @@ from datetime import datetime
|
||||
from typing import Optional
|
||||
from uuid import uuid4
|
||||
|
||||
from sqlalchemy import Column, JSON, String
|
||||
from sqlmodel import Field, SQLModel, Relationship
|
||||
|
||||
from ..types import JobState
|
||||
from sqlalchemy import Column, JSON, String, ForeignKey
|
||||
from sqlalchemy.orm import Mapped, relationship
|
||||
from sqlmodel import Field, SQLModel
|
||||
|
||||
|
||||
class Job(SQLModel, table=True):
|
||||
__tablename__ = "job"
|
||||
|
||||
id: str = Field(default_factory=lambda: uuid4().hex, primary_key=True, index=True)
|
||||
client_id: str = Field(index=True)
|
||||
|
||||
state: JobState = Field(default=JobState.queued, sa_column_kwargs={"nullable": False})
|
||||
state: str = Field(default="QUEUED", max_length=20)
|
||||
payload: dict = Field(sa_column=Column(JSON, nullable=False))
|
||||
constraints: dict = Field(default_factory=dict, sa_column=Column(JSON, nullable=False))
|
||||
|
||||
@@ -30,8 +31,8 @@ class Job(SQLModel, table=True):
|
||||
error: Optional[str] = None
|
||||
|
||||
# Payment tracking
|
||||
payment_id: Optional[str] = Field(default=None, foreign_key="job_payments.id", index=True)
|
||||
payment_id: Optional[str] = Field(default=None, sa_column=Column(String, ForeignKey("job_payments.id"), index=True))
|
||||
payment_status: Optional[str] = Field(default=None, max_length=20) # pending, escrowed, released, refunded
|
||||
|
||||
# Relationships
|
||||
payment: Optional["JobPayment"] = Relationship(back_populates="jobs")
|
||||
# payment: Mapped[Optional["JobPayment"]] = relationship(back_populates="jobs")
|
||||
|
||||
@@ -1,27 +1,20 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime
|
||||
from enum import Enum
|
||||
from typing import Optional
|
||||
from uuid import uuid4
|
||||
|
||||
from sqlalchemy import Column, Enum as SAEnum, JSON
|
||||
from sqlalchemy import Column, JSON
|
||||
from sqlmodel import Field, SQLModel
|
||||
|
||||
|
||||
class OfferStatus(str, Enum):
|
||||
open = "open"
|
||||
reserved = "reserved"
|
||||
closed = "closed"
|
||||
|
||||
|
||||
class MarketplaceOffer(SQLModel, table=True):
|
||||
id: str = Field(default_factory=lambda: uuid4().hex, primary_key=True)
|
||||
provider: str = Field(index=True)
|
||||
capacity: int = Field(default=0, nullable=False)
|
||||
price: float = Field(default=0.0, nullable=False)
|
||||
sla: str = Field(default="")
|
||||
status: OfferStatus = Field(default=OfferStatus.open, sa_column=Column(SAEnum(OfferStatus), nullable=False))
|
||||
status: str = Field(default="open", max_length=20)
|
||||
created_at: datetime = Field(default_factory=datetime.utcnow, nullable=False, index=True)
|
||||
attributes: dict = Field(default_factory=dict, sa_column=Column(JSON, nullable=False))
|
||||
|
||||
|
||||
@@ -6,10 +6,9 @@ from datetime import datetime
|
||||
from typing import Optional, List
|
||||
from uuid import uuid4
|
||||
|
||||
from sqlalchemy import Column, String, DateTime, Numeric, ForeignKey
|
||||
from sqlmodel import Field, SQLModel, Relationship
|
||||
|
||||
from ..schemas.payments import PaymentStatus, PaymentMethod
|
||||
from sqlalchemy import Column, String, DateTime, Numeric, ForeignKey, JSON
|
||||
from sqlalchemy.orm import Mapped, relationship
|
||||
from sqlmodel import Field, SQLModel
|
||||
|
||||
|
||||
class JobPayment(SQLModel, table=True):
|
||||
@@ -23,8 +22,8 @@ class JobPayment(SQLModel, table=True):
|
||||
# Payment details
|
||||
amount: float = Field(sa_column=Column(Numeric(20, 8), nullable=False))
|
||||
currency: str = Field(default="AITBC", max_length=10)
|
||||
status: PaymentStatus = Field(default=PaymentStatus.PENDING)
|
||||
payment_method: PaymentMethod = Field(default=PaymentMethod.AITBC_TOKEN)
|
||||
status: str = Field(default="pending", max_length=20)
|
||||
payment_method: str = Field(default="aitbc_token", max_length=20)
|
||||
|
||||
# Addresses
|
||||
escrow_address: Optional[str] = Field(default=None, max_length=100)
|
||||
@@ -43,10 +42,10 @@ class JobPayment(SQLModel, table=True):
|
||||
expires_at: Optional[datetime] = None
|
||||
|
||||
# Additional metadata
|
||||
metadata: Optional[dict] = Field(default=None)
|
||||
meta_data: Optional[dict] = Field(default=None, sa_column=Column(JSON))
|
||||
|
||||
# Relationships
|
||||
jobs: List["Job"] = Relationship(back_populates="payment")
|
||||
# jobs: Mapped[List["Job"]] = relationship(back_populates="payment")
|
||||
|
||||
|
||||
class PaymentEscrow(SQLModel, table=True):
|
||||
|
||||
@@ -6,13 +6,6 @@ from sqlmodel import SQLModel, Field, Relationship, Column
|
||||
from sqlalchemy import JSON
|
||||
from datetime import datetime
|
||||
from typing import Optional, List
|
||||
from enum import Enum
|
||||
|
||||
|
||||
class UserStatus(str, Enum):
|
||||
ACTIVE = "active"
|
||||
INACTIVE = "inactive"
|
||||
SUSPENDED = "suspended"
|
||||
|
||||
|
||||
class User(SQLModel, table=True):
|
||||
@@ -20,7 +13,7 @@ class User(SQLModel, table=True):
|
||||
id: str = Field(primary_key=True)
|
||||
email: str = Field(unique=True, index=True)
|
||||
username: str = Field(unique=True, index=True)
|
||||
status: UserStatus = Field(default=UserStatus.ACTIVE)
|
||||
status: str = Field(default="active", max_length=20)
|
||||
created_at: datetime = Field(default_factory=datetime.utcnow)
|
||||
updated_at: datetime = Field(default_factory=datetime.utcnow)
|
||||
last_login: Optional[datetime] = None
|
||||
@@ -44,28 +37,13 @@ class Wallet(SQLModel, table=True):
|
||||
transactions: List["Transaction"] = Relationship(back_populates="wallet")
|
||||
|
||||
|
||||
class TransactionType(str, Enum):
|
||||
DEPOSIT = "deposit"
|
||||
WITHDRAWAL = "withdrawal"
|
||||
PURCHASE = "purchase"
|
||||
REWARD = "reward"
|
||||
REFUND = "refund"
|
||||
|
||||
|
||||
class TransactionStatus(str, Enum):
|
||||
PENDING = "pending"
|
||||
COMPLETED = "completed"
|
||||
FAILED = "failed"
|
||||
CANCELLED = "cancelled"
|
||||
|
||||
|
||||
class Transaction(SQLModel, table=True):
|
||||
"""Transaction model"""
|
||||
id: str = Field(primary_key=True)
|
||||
user_id: str = Field(foreign_key="user.id")
|
||||
wallet_id: Optional[int] = Field(foreign_key="wallet.id")
|
||||
type: TransactionType
|
||||
status: TransactionStatus = Field(default=TransactionStatus.PENDING)
|
||||
type: str = Field(max_length=20)
|
||||
status: str = Field(default="pending", max_length=20)
|
||||
amount: float
|
||||
fee: float = Field(default=0.0)
|
||||
description: Optional[str] = None
|
||||
|
||||
Reference in New Issue
Block a user