forked from 0xWheatyz/SPARC
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3dac88ec90 |
@@ -54,6 +54,21 @@ docker-compose up -d
|
|||||||
# - API Docs: http://localhost:8000/docs
|
# - API Docs: http://localhost:8000/docs
|
||||||
```
|
```
|
||||||
|
|
||||||
|
#### Patent PDF Storage
|
||||||
|
|
||||||
|
The API stores downloaded patent PDFs in a `patents/` directory. In Docker,
|
||||||
|
this is mounted as a bind mount (`./patents:/app/patents`) so that PDFs persist
|
||||||
|
across container restarts.
|
||||||
|
|
||||||
|
If you deploy to a different environment, ensure the `patents/` directory is a
|
||||||
|
persistent volume. Without it, PDFs will be re-downloaded on every analysis.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
# docker-compose.yml excerpt
|
||||||
|
volumes:
|
||||||
|
- ./patents:/app/patents
|
||||||
|
```
|
||||||
|
|
||||||
### NixOS
|
### NixOS
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
+19
-5
@@ -104,21 +104,33 @@ class CompanyAnalyzer:
|
|||||||
def analyze_single_patent(self, patent_id: str, company_name: str) -> str:
|
def analyze_single_patent(self, patent_id: str, company_name: str) -> str:
|
||||||
"""Analyze a single patent by ID.
|
"""Analyze a single patent by ID.
|
||||||
|
|
||||||
Useful for focused analysis of specific innovations.
|
Prerequisite:
|
||||||
|
The patent PDF must already exist at ``patents/{patent_id}.pdf``
|
||||||
|
before calling this method. PDFs are downloaded automatically when
|
||||||
|
using the batch analysis pipeline (``analyze_company`` or the
|
||||||
|
``/analyze/batch`` API endpoint). For standalone usage, download
|
||||||
|
the PDF manually or call ``SERP.save_patents()`` first.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
patent_id: Publication ID of the patent
|
patent_id: Publication ID of the patent (e.g. "US-11234567-B2")
|
||||||
company_name: Name of the company (for context)
|
company_name: Name of the company (for context)
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Analysis of the specific patent's innovation quality
|
Analysis of the specific patent's innovation quality
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
FileNotFoundError: If the patent PDF is not found at the expected path.
|
||||||
"""
|
"""
|
||||||
# Note: This simplified version assumes the patent PDF is already downloaded
|
import os
|
||||||
# A more complete implementation would support direct patent ID lookup
|
|
||||||
print(f"Analyzing patent {patent_id} for {company_name}...")
|
|
||||||
|
|
||||||
patent_path = f"patents/{patent_id}.pdf"
|
patent_path = f"patents/{patent_id}.pdf"
|
||||||
|
|
||||||
|
if not os.path.exists(patent_path):
|
||||||
|
raise FileNotFoundError(
|
||||||
|
f"Patent PDF not found at '{patent_path}'. "
|
||||||
|
f"Download the PDF first using SERP.save_patents() or the batch analysis pipeline."
|
||||||
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
sections = SERP.parse_patent_pdf(patent_path)
|
sections = SERP.parse_patent_pdf(patent_path)
|
||||||
minimized_content = SERP.minimize_patent_for_llm(sections)
|
minimized_content = SERP.minimize_patent_for_llm(sections)
|
||||||
@@ -129,6 +141,8 @@ class CompanyAnalyzer:
|
|||||||
|
|
||||||
return analysis
|
return analysis
|
||||||
|
|
||||||
|
except FileNotFoundError:
|
||||||
|
raise
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return f"Failed to analyze patent {patent_id}: {e}"
|
return f"Failed to analyze patent {patent_id}: {e}"
|
||||||
|
|
||||||
|
|||||||
+2
-6
@@ -16,13 +16,11 @@ from SPARC.analyzer import CompanyAnalyzer
|
|||||||
from SPARC.auth import (
|
from SPARC.auth import (
|
||||||
TokenResponse,
|
TokenResponse,
|
||||||
UserResponse,
|
UserResponse,
|
||||||
close_db_client,
|
|
||||||
create_tokens,
|
create_tokens,
|
||||||
decode_token,
|
decode_token,
|
||||||
get_current_admin,
|
get_current_admin,
|
||||||
get_current_user,
|
get_current_user,
|
||||||
get_db_client,
|
get_db_client,
|
||||||
init_db_client,
|
|
||||||
)
|
)
|
||||||
from SPARC.types import BatchAnalysisResult, CompanyAnalysisResult
|
from SPARC.types import BatchAnalysisResult, CompanyAnalysisResult
|
||||||
|
|
||||||
@@ -150,14 +148,12 @@ _analyzer: CompanyAnalyzer | None = None
|
|||||||
|
|
||||||
@asynccontextmanager
|
@asynccontextmanager
|
||||||
async def lifespan(app: FastAPI):
|
async def lifespan(app: FastAPI):
|
||||||
"""Initialize resources on startup, clean up on shutdown."""
|
"""Initialize resources on startup."""
|
||||||
global _analyzer
|
global _analyzer
|
||||||
init_db_client()
|
|
||||||
_analyzer = CompanyAnalyzer()
|
_analyzer = CompanyAnalyzer()
|
||||||
yield
|
yield
|
||||||
# Cleanup
|
# Cleanup if needed
|
||||||
_analyzer = None
|
_analyzer = None
|
||||||
close_db_client()
|
|
||||||
|
|
||||||
|
|
||||||
app = FastAPI(
|
app = FastAPI(
|
||||||
|
|||||||
+4
-29
@@ -132,36 +132,11 @@ def decode_token(token: str) -> Optional[TokenPayload]:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
# Shared database client singleton, initialized at startup via init_db_client()
|
|
||||||
_db_client: DatabaseClient | None = None
|
|
||||||
|
|
||||||
|
|
||||||
def init_db_client() -> None:
|
|
||||||
"""Initialize the shared database client. Call once at app startup."""
|
|
||||||
global _db_client
|
|
||||||
_db_client = DatabaseClient(config.database_url)
|
|
||||||
_db_client.connect()
|
|
||||||
|
|
||||||
|
|
||||||
def close_db_client() -> None:
|
|
||||||
"""Close the shared database client. Call at app shutdown."""
|
|
||||||
global _db_client
|
|
||||||
if _db_client:
|
|
||||||
_db_client.close()
|
|
||||||
_db_client = None
|
|
||||||
|
|
||||||
|
|
||||||
def get_db_client() -> DatabaseClient:
|
def get_db_client() -> DatabaseClient:
|
||||||
"""Get the shared pooled database client for auth operations.
|
"""Get database client for auth operations."""
|
||||||
|
client = DatabaseClient(config.database_url)
|
||||||
Returns the module-level singleton DatabaseClient. If not yet initialized
|
client.connect()
|
||||||
(e.g., during tests), creates a new instance as a fallback.
|
return client
|
||||||
"""
|
|
||||||
global _db_client
|
|
||||||
if _db_client is None:
|
|
||||||
_db_client = DatabaseClient(config.database_url)
|
|
||||||
_db_client.connect()
|
|
||||||
return _db_client
|
|
||||||
|
|
||||||
|
|
||||||
async def get_current_user(
|
async def get_current_user(
|
||||||
|
|||||||
+165
-152
@@ -201,6 +201,8 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Cached message dict if found, None otherwise
|
Cached message dict if found, None otherwise
|
||||||
"""
|
"""
|
||||||
|
self.connect()
|
||||||
|
|
||||||
prompt_hash = self.hash_prompt(prompt)
|
prompt_hash = self.hash_prompt(prompt)
|
||||||
|
|
||||||
query = """
|
query = """
|
||||||
@@ -223,11 +225,10 @@ class DatabaseClient:
|
|||||||
|
|
||||||
query += " ORDER BY timestamp DESC LIMIT 1"
|
query += " ORDER BY timestamp DESC LIMIT 1"
|
||||||
|
|
||||||
with self.get_conn() as conn:
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
cursor.execute(query, params)
|
||||||
cursor.execute(query, params)
|
result = cursor.fetchone()
|
||||||
result = cursor.fetchone()
|
return dict(result) if result else None
|
||||||
return dict(result) if result else None
|
|
||||||
|
|
||||||
def store_message(
|
def store_message(
|
||||||
self,
|
self,
|
||||||
@@ -255,32 +256,33 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
The ID of the inserted record
|
The ID of the inserted record
|
||||||
"""
|
"""
|
||||||
|
self.connect()
|
||||||
|
|
||||||
prompt_hash = self.hash_prompt(prompt)
|
prompt_hash = self.hash_prompt(prompt)
|
||||||
|
|
||||||
with self.get_conn() as conn:
|
with self.conn.cursor() as cursor:
|
||||||
with conn.cursor() as cursor:
|
cursor.execute(
|
||||||
cursor.execute(
|
"""
|
||||||
"""
|
INSERT INTO llm_messages
|
||||||
INSERT INTO llm_messages
|
(prompt, prompt_hash, response, company_name, analysis_type, model, metadata, token_usage, is_cached)
|
||||||
(prompt, prompt_hash, response, company_name, analysis_type, model, metadata, token_usage, is_cached)
|
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
|
RETURNING id
|
||||||
RETURNING id
|
""",
|
||||||
""",
|
(
|
||||||
(
|
prompt,
|
||||||
prompt,
|
prompt_hash,
|
||||||
prompt_hash,
|
response,
|
||||||
response,
|
company_name,
|
||||||
company_name,
|
analysis_type,
|
||||||
analysis_type,
|
model,
|
||||||
model,
|
json.dumps(metadata) if metadata else None,
|
||||||
json.dumps(metadata) if metadata else None,
|
json.dumps(token_usage) if token_usage else None,
|
||||||
json.dumps(token_usage) if token_usage else None,
|
is_cached,
|
||||||
is_cached,
|
),
|
||||||
),
|
)
|
||||||
)
|
|
||||||
|
|
||||||
message_id = cursor.fetchone()[0]
|
message_id = cursor.fetchone()[0]
|
||||||
conn.commit()
|
self.conn.commit()
|
||||||
|
|
||||||
return message_id
|
return message_id
|
||||||
|
|
||||||
@@ -302,6 +304,8 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
List of message dictionaries
|
List of message dictionaries
|
||||||
"""
|
"""
|
||||||
|
self.connect()
|
||||||
|
|
||||||
query = "SELECT * FROM llm_messages WHERE 1=1"
|
query = "SELECT * FROM llm_messages WHERE 1=1"
|
||||||
params = []
|
params = []
|
||||||
|
|
||||||
@@ -316,10 +320,9 @@ class DatabaseClient:
|
|||||||
query += " ORDER BY timestamp DESC LIMIT %s OFFSET %s"
|
query += " ORDER BY timestamp DESC LIMIT %s OFFSET %s"
|
||||||
params.extend([limit, offset])
|
params.extend([limit, offset])
|
||||||
|
|
||||||
with self.get_conn() as conn:
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
cursor.execute(query, params)
|
||||||
cursor.execute(query, params)
|
return [dict(row) for row in cursor.fetchall()]
|
||||||
return [dict(row) for row in cursor.fetchall()]
|
|
||||||
|
|
||||||
def get_analytics(self, days: int = 30) -> Dict:
|
def get_analytics(self, days: int = 30) -> Dict:
|
||||||
"""Get analytics on message usage.
|
"""Get analytics on message usage.
|
||||||
@@ -330,52 +333,53 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Dictionary with analytics data
|
Dictionary with analytics data
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
# Total messages
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
SELECT COUNT(*) as total_messages
|
|
||||||
FROM llm_messages
|
|
||||||
WHERE timestamp >= NOW() - INTERVAL '%s days'
|
|
||||||
""",
|
|
||||||
(days,),
|
|
||||||
)
|
|
||||||
total = cursor.fetchone()["total_messages"]
|
|
||||||
|
|
||||||
# Messages by company
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
cursor.execute(
|
# Total messages
|
||||||
"""
|
cursor.execute(
|
||||||
SELECT company_name, COUNT(*) as count
|
"""
|
||||||
FROM llm_messages
|
SELECT COUNT(*) as total_messages
|
||||||
WHERE timestamp >= NOW() - INTERVAL '%s days'
|
FROM llm_messages
|
||||||
GROUP BY company_name
|
WHERE timestamp >= NOW() - INTERVAL '%s days'
|
||||||
ORDER BY count DESC
|
""",
|
||||||
LIMIT 10
|
(days,),
|
||||||
""",
|
)
|
||||||
(days,),
|
total = cursor.fetchone()["total_messages"]
|
||||||
)
|
|
||||||
by_company = cursor.fetchall()
|
|
||||||
|
|
||||||
# Messages by type
|
# Messages by company
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"""
|
"""
|
||||||
SELECT analysis_type, COUNT(*) as count
|
SELECT company_name, COUNT(*) as count
|
||||||
FROM llm_messages
|
FROM llm_messages
|
||||||
WHERE timestamp >= NOW() - INTERVAL '%s days'
|
WHERE timestamp >= NOW() - INTERVAL '%s days'
|
||||||
GROUP BY analysis_type
|
GROUP BY company_name
|
||||||
ORDER BY count DESC
|
ORDER BY count DESC
|
||||||
""",
|
LIMIT 10
|
||||||
(days,),
|
""",
|
||||||
)
|
(days,),
|
||||||
by_type = cursor.fetchall()
|
)
|
||||||
|
by_company = cursor.fetchall()
|
||||||
|
|
||||||
return {
|
# Messages by type
|
||||||
"total_messages": total,
|
cursor.execute(
|
||||||
"by_company": [dict(row) for row in by_company],
|
"""
|
||||||
"by_type": [dict(row) for row in by_type],
|
SELECT analysis_type, COUNT(*) as count
|
||||||
"period_days": days,
|
FROM llm_messages
|
||||||
}
|
WHERE timestamp >= NOW() - INTERVAL '%s days'
|
||||||
|
GROUP BY analysis_type
|
||||||
|
ORDER BY count DESC
|
||||||
|
""",
|
||||||
|
(days,),
|
||||||
|
)
|
||||||
|
by_type = cursor.fetchall()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"total_messages": total,
|
||||||
|
"by_company": [dict(row) for row in by_company],
|
||||||
|
"by_type": [dict(row) for row in by_type],
|
||||||
|
"period_days": days,
|
||||||
|
}
|
||||||
|
|
||||||
# Patent Cache Methods
|
# Patent Cache Methods
|
||||||
|
|
||||||
@@ -501,23 +505,25 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Created user dict or None if email exists
|
Created user dict or None if email exists
|
||||||
"""
|
"""
|
||||||
|
self.connect()
|
||||||
|
|
||||||
password_hash = self.hash_password(password)
|
password_hash = self.hash_password(password)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with self.get_conn() as conn:
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
cursor.execute(
|
||||||
cursor.execute(
|
"""
|
||||||
"""
|
INSERT INTO users (email, password_hash, role)
|
||||||
INSERT INTO users (email, password_hash, role)
|
VALUES (%s, %s, %s)
|
||||||
VALUES (%s, %s, %s)
|
RETURNING id, email, role, created_at
|
||||||
RETURNING id, email, role, created_at
|
""",
|
||||||
""",
|
(email, password_hash, role),
|
||||||
(email, password_hash, role),
|
)
|
||||||
)
|
user = cursor.fetchone()
|
||||||
user = cursor.fetchone()
|
self.conn.commit()
|
||||||
conn.commit()
|
|
||||||
return dict(user) if user else None
|
return dict(user) if user else None
|
||||||
except psycopg2.errors.UniqueViolation:
|
except psycopg2.errors.UniqueViolation:
|
||||||
|
self.conn.rollback()
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def authenticate_user(self, email: str, password: str) -> Optional[Dict]:
|
def authenticate_user(self, email: str, password: str) -> Optional[Dict]:
|
||||||
@@ -530,22 +536,23 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
User dict if authenticated, None otherwise
|
User dict if authenticated, None otherwise
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(
|
|
||||||
"SELECT * FROM users WHERE email = %s",
|
|
||||||
(email,),
|
|
||||||
)
|
|
||||||
user = cursor.fetchone()
|
|
||||||
|
|
||||||
if user and self.verify_password(password, user["password_hash"]):
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
return {
|
cursor.execute(
|
||||||
"id": user["id"],
|
"SELECT * FROM users WHERE email = %s",
|
||||||
"email": user["email"],
|
(email,),
|
||||||
"role": user["role"],
|
)
|
||||||
"created_at": user["created_at"],
|
user = cursor.fetchone()
|
||||||
}
|
|
||||||
return None
|
if user and self.verify_password(password, user["password_hash"]):
|
||||||
|
return {
|
||||||
|
"id": user["id"],
|
||||||
|
"email": user["email"],
|
||||||
|
"role": user["role"],
|
||||||
|
"created_at": user["created_at"],
|
||||||
|
}
|
||||||
|
return None
|
||||||
|
|
||||||
def get_user_by_id(self, user_id: int) -> Optional[Dict]:
|
def get_user_by_id(self, user_id: int) -> Optional[Dict]:
|
||||||
"""Get a user by ID.
|
"""Get a user by ID.
|
||||||
@@ -556,14 +563,15 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
User dict or None
|
User dict or None
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
"SELECT id, email, role, created_at FROM users WHERE id = %s",
|
cursor.execute(
|
||||||
(user_id,),
|
"SELECT id, email, role, created_at FROM users WHERE id = %s",
|
||||||
)
|
(user_id,),
|
||||||
user = cursor.fetchone()
|
)
|
||||||
return dict(user) if user else None
|
user = cursor.fetchone()
|
||||||
|
return dict(user) if user else None
|
||||||
|
|
||||||
def get_user_by_email(self, email: str) -> Optional[Dict]:
|
def get_user_by_email(self, email: str) -> Optional[Dict]:
|
||||||
"""Get a user by email.
|
"""Get a user by email.
|
||||||
@@ -574,14 +582,15 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
User dict or None
|
User dict or None
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
"SELECT id, email, role, created_at FROM users WHERE email = %s",
|
cursor.execute(
|
||||||
(email,),
|
"SELECT id, email, role, created_at FROM users WHERE email = %s",
|
||||||
)
|
(email,),
|
||||||
user = cursor.fetchone()
|
)
|
||||||
return dict(user) if user else None
|
user = cursor.fetchone()
|
||||||
|
return dict(user) if user else None
|
||||||
|
|
||||||
def get_all_users(self, limit: int = 100, offset: int = 0) -> List[Dict]:
|
def get_all_users(self, limit: int = 100, offset: int = 0) -> List[Dict]:
|
||||||
"""Get all users (admin only).
|
"""Get all users (admin only).
|
||||||
@@ -593,18 +602,19 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
List of user dicts
|
List of user dicts
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
"""
|
cursor.execute(
|
||||||
SELECT id, email, role, created_at
|
"""
|
||||||
FROM users
|
SELECT id, email, role, created_at
|
||||||
ORDER BY created_at DESC
|
FROM users
|
||||||
LIMIT %s OFFSET %s
|
ORDER BY created_at DESC
|
||||||
""",
|
LIMIT %s OFFSET %s
|
||||||
(limit, offset),
|
""",
|
||||||
)
|
(limit, offset),
|
||||||
return [dict(row) for row in cursor.fetchall()]
|
)
|
||||||
|
return [dict(row) for row in cursor.fetchall()]
|
||||||
|
|
||||||
def update_user_role(self, user_id: int, role: str) -> Optional[Dict]:
|
def update_user_role(self, user_id: int, role: str) -> Optional[Dict]:
|
||||||
"""Update a user's role (admin only).
|
"""Update a user's role (admin only).
|
||||||
@@ -616,19 +626,20 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Updated user dict or None
|
Updated user dict or None
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
"""
|
cursor.execute(
|
||||||
UPDATE users
|
"""
|
||||||
SET role = %s, updated_at = CURRENT_TIMESTAMP
|
UPDATE users
|
||||||
WHERE id = %s
|
SET role = %s, updated_at = CURRENT_TIMESTAMP
|
||||||
RETURNING id, email, role, created_at
|
WHERE id = %s
|
||||||
""",
|
RETURNING id, email, role, created_at
|
||||||
(role, user_id),
|
""",
|
||||||
)
|
(role, user_id),
|
||||||
user = cursor.fetchone()
|
)
|
||||||
conn.commit()
|
user = cursor.fetchone()
|
||||||
|
self.conn.commit()
|
||||||
return dict(user) if user else None
|
return dict(user) if user else None
|
||||||
|
|
||||||
def delete_user(self, user_id: int) -> bool:
|
def delete_user(self, user_id: int) -> bool:
|
||||||
@@ -640,11 +651,12 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
True if deleted
|
True if deleted
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor() as cursor:
|
|
||||||
cursor.execute("DELETE FROM users WHERE id = %s", (user_id,))
|
with self.conn.cursor() as cursor:
|
||||||
deleted = cursor.rowcount > 0
|
cursor.execute("DELETE FROM users WHERE id = %s", (user_id,))
|
||||||
conn.commit()
|
deleted = cursor.rowcount > 0
|
||||||
|
self.conn.commit()
|
||||||
return deleted
|
return deleted
|
||||||
|
|
||||||
def get_user_count(self) -> int:
|
def get_user_count(self) -> int:
|
||||||
@@ -653,7 +665,8 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Number of users
|
Number of users
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor() as cursor:
|
|
||||||
cursor.execute("SELECT COUNT(*) FROM users")
|
with self.conn.cursor() as cursor:
|
||||||
return cursor.fetchone()[0]
|
cursor.execute("SELECT COUNT(*) FROM users")
|
||||||
|
return cursor.fetchone()[0]
|
||||||
|
|||||||
Generated
+4728
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user