feat: update version to 0.3.2-dev and enhance Google Drive upload with optional metadata extraction
This commit is contained in:
+1
-1
@@ -131,7 +131,7 @@ class Settings(BaseSettings):
|
|||||||
return f.read().strip()
|
return f.read().strip()
|
||||||
|
|
||||||
# Default version if not found
|
# Default version if not found
|
||||||
return "0.1.0-dev"
|
return "0.3.2-dev"
|
||||||
|
|
||||||
class Config:
|
class Config:
|
||||||
env_file = ".env"
|
env_file = ".env"
|
||||||
|
|||||||
@@ -44,10 +44,61 @@ def get_google_drive_service():
|
|||||||
logger.error(f"Failed to authenticate with Google Drive: {str(e)}")
|
logger.error(f"Failed to authenticate with Google Drive: {str(e)}")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def extract_metadata_from_file(file_path):
|
||||||
|
"""
|
||||||
|
Try to extract metadata from a file using several methods:
|
||||||
|
1. Check for a .json metadata file with the same name
|
||||||
|
|
||||||
|
Returns a dictionary of metadata or empty dict if not found
|
||||||
|
"""
|
||||||
|
# Check for separate metadata JSON file
|
||||||
|
metadata_path = os.path.splitext(file_path)[0] + '.json'
|
||||||
|
if os.path.exists(metadata_path):
|
||||||
|
try:
|
||||||
|
with open(metadata_path, 'r', encoding='utf-8') as f:
|
||||||
|
metadata = json.load(f)
|
||||||
|
logger.info(f"Loaded metadata from external JSON file: {metadata_path}")
|
||||||
|
return metadata
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Failed to load metadata from JSON file: {str(e)}")
|
||||||
|
|
||||||
|
return {}
|
||||||
|
|
||||||
|
def truncate_property_value(key, value, max_bytes=100):
|
||||||
|
"""
|
||||||
|
Truncate a property value to ensure the key+value stays under the byte limit.
|
||||||
|
Google Drive has a 124 byte limit for property key-value pairs.
|
||||||
|
We reserve ~20-24 bytes for the key and leave ~100 bytes for the value.
|
||||||
|
"""
|
||||||
|
# Convert to string if not already
|
||||||
|
str_value = str(value)
|
||||||
|
|
||||||
|
# Calculate current size of key and value in bytes
|
||||||
|
key_bytes = len(key.encode('utf-8'))
|
||||||
|
value_bytes = len(str_value.encode('utf-8'))
|
||||||
|
total_bytes = key_bytes + value_bytes
|
||||||
|
|
||||||
|
# If under limit, return original value
|
||||||
|
if total_bytes <= max_bytes:
|
||||||
|
return str_value
|
||||||
|
|
||||||
|
# Calculate how many bytes we need to trim from value
|
||||||
|
# Leave a small buffer to be safe
|
||||||
|
bytes_to_trim = total_bytes - max_bytes + 4
|
||||||
|
|
||||||
|
# Iteratively truncate the string until it's under the byte limit
|
||||||
|
while len(str_value.encode('utf-8')) > value_bytes - bytes_to_trim:
|
||||||
|
str_value = str_value[:-1]
|
||||||
|
|
||||||
|
# Add ellipsis to indicate truncation
|
||||||
|
if str_value != str(value):
|
||||||
|
str_value = str_value[:-3] + "..."
|
||||||
|
|
||||||
|
return str_value
|
||||||
|
|
||||||
@celery.task(base=BaseTaskWithRetry)
|
@celery.task(base=BaseTaskWithRetry)
|
||||||
def upload_to_google_drive(file_path: str):
|
def upload_to_google_drive(file_path: str, include_metadata=True):
|
||||||
"""Uploads a file to Google Drive in the configured folder."""
|
"""Uploads a file to Google Drive in the configured folder with optional metadata."""
|
||||||
|
|
||||||
if not os.path.exists(file_path):
|
if not os.path.exists(file_path):
|
||||||
raise FileNotFoundError(f"File not found: {file_path}")
|
raise FileNotFoundError(f"File not found: {file_path}")
|
||||||
@@ -55,6 +106,11 @@ def upload_to_google_drive(file_path: str):
|
|||||||
# Extract filename from path
|
# Extract filename from path
|
||||||
filename = os.path.basename(file_path)
|
filename = os.path.basename(file_path)
|
||||||
|
|
||||||
|
# Extract metadata if available
|
||||||
|
metadata = {}
|
||||||
|
if include_metadata:
|
||||||
|
metadata = extract_metadata_from_file(file_path)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Get Google Drive service
|
# Get Google Drive service
|
||||||
service = get_google_drive_service()
|
service = get_google_drive_service()
|
||||||
@@ -70,6 +126,41 @@ def upload_to_google_drive(file_path: str):
|
|||||||
if settings.google_drive_folder_id:
|
if settings.google_drive_folder_id:
|
||||||
file_metadata['parents'] = [settings.google_drive_folder_id]
|
file_metadata['parents'] = [settings.google_drive_folder_id]
|
||||||
|
|
||||||
|
# Add custom properties if metadata exists
|
||||||
|
if metadata:
|
||||||
|
# Google Drive properties must be strings and can't be nested objects
|
||||||
|
file_metadata['properties'] = {}
|
||||||
|
|
||||||
|
# Only add a few important top-level metadata fields as properties
|
||||||
|
# Skip nested objects and long values to avoid the 124-byte limit
|
||||||
|
safe_properties = {}
|
||||||
|
for key, value in metadata.items():
|
||||||
|
# Skip nested structures completely - they'll be in the description
|
||||||
|
if isinstance(value, (dict, list)):
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Try to add simple values with truncation if needed
|
||||||
|
try:
|
||||||
|
truncated_value = truncate_property_value(key, value)
|
||||||
|
safe_properties[key] = truncated_value
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Skipping metadata property {key}: {str(e)}")
|
||||||
|
|
||||||
|
# Only use the safe properties
|
||||||
|
file_metadata['properties'] = safe_properties
|
||||||
|
|
||||||
|
# Add minimal appProperties
|
||||||
|
file_metadata['appProperties'] = {
|
||||||
|
'docunova': 'true'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Add metadata to file description for better visibility in Google Drive UI
|
||||||
|
# Description has much higher size limits than properties
|
||||||
|
formatted_json = json.dumps(metadata, indent=2)
|
||||||
|
file_metadata['description'] = f"Document Metadata:\n\n```json\n{formatted_json}\n```"
|
||||||
|
|
||||||
|
logger.debug(f"Adding metadata to Google Drive file: {json.dumps(file_metadata['properties'])}")
|
||||||
|
|
||||||
# Upload file with metadata
|
# Upload file with metadata
|
||||||
media = MediaFileUpload(
|
media = MediaFileUpload(
|
||||||
file_path,
|
file_path,
|
||||||
@@ -80,7 +171,7 @@ def upload_to_google_drive(file_path: str):
|
|||||||
file = service.files().create(
|
file = service.files().create(
|
||||||
body=file_metadata,
|
body=file_metadata,
|
||||||
media_body=media,
|
media_body=media,
|
||||||
fields='id,name,webViewLink'
|
fields='id,name,webViewLink,properties,appProperties,description'
|
||||||
).execute()
|
).execute()
|
||||||
|
|
||||||
# Log success details
|
# Log success details
|
||||||
@@ -90,13 +181,19 @@ def upload_to_google_drive(file_path: str):
|
|||||||
logger.info(f"Successfully uploaded {filename} to Google Drive with ID: {file_id}")
|
logger.info(f"Successfully uploaded {filename} to Google Drive with ID: {file_id}")
|
||||||
logger.info(f"File accessible at: {web_view_link}")
|
logger.info(f"File accessible at: {web_view_link}")
|
||||||
|
|
||||||
return {
|
result = {
|
||||||
"status": "Completed",
|
"status": "Completed",
|
||||||
"file_path": file_path,
|
"file_path": file_path,
|
||||||
"google_drive_file_id": file_id,
|
"google_drive_file_id": file_id,
|
||||||
"google_drive_web_link": web_view_link
|
"google_drive_web_link": web_view_link
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Add metadata info to result if included
|
||||||
|
if metadata:
|
||||||
|
result["metadata_included"] = True
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
error_msg = f"Failed to upload {filename} to Google Drive: {str(e)}"
|
error_msg = f"Failed to upload {filename} to Google Drive: {str(e)}"
|
||||||
logger.error(error_msg)
|
logger.error(error_msg)
|
||||||
|
|||||||
Reference in New Issue
Block a user