notid/email-organizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Bryce
2025-08-11 06:37:24 -07:00
parent 0dac428217
commit cc1523cbb2
6 changed files with 92 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/ai_service.py
View File

@@ -60,37 +60,6 @@ class AIService:
return None
def generate_single_rule(self, folder_name: str, folder_type: str = 'destination', rule_text: str ='') -> Tuple[Optional[str], Optional[Dict]]:
"""Generate a single email organization rule using AI."""
prompt = self._build_single_rule_prompt(folder_name, folder_type, rule_text)
payload = {
'model': self.model,
'messages': [
{'role': 'system', 'content': 'You are an expert email organizer assistant.'},
{'role': 'user', 'content': prompt}
],
'max_tokens': 800,
'temperature': 0.7
}
result = self._make_request('chat/completions', payload)
if not result or 'choices' not in result or not result['choices']:
return None, {'error': 'No response from AI service'}
try:
rule_text = result['choices'][0]['message']['content'].strip()
quality_score = self._assess_rule_quality(rule_text, folder_name, folder_type)
return rule_text, {
'quality_score': quality_score,
'model_used': self.model,
'generated_at': datetime.utcnow().isoformat()
}
except (KeyError, IndexError) as e:
return None, {'error': f'Failed to parse AI response: {str(e)}'}
def generate_multiple_rules(self, folder_name: str, folder_type: str = 'destination', rule_text:str = '', count: int = 3) -> Tuple[Optional[List[Dict]], Optional[Dict]]:
"""Generate multiple email organization rule options using AI."""
prompt = self._build_multiple_rules_prompt(folder_name, folder_type, rule_text, count)

117
app/routes/folders.py
View File

@@ -27,7 +27,9 @@ def index():
@login_required
def new_folder_modal():
"""Return the add folder modal."""
response = make_response(render_template('partials/folder_modal.html'))
response = make_response(render_template('partials/folder_modal.html', folder_data={'rule_text': folder.rule_text,
'show_ai_rules': True,
'errors': None }))
response.headers['HX-Trigger'] = 'open-modal'
return response
@@ -59,7 +61,10 @@ def add_folder():
# If there are validation errors, return the modal with errors
if errors:
response = make_response(render_template('partials/folder_modal.html', errors=errors, name=name, rule_text=rule_text, priority=priority))
response = make_response(render_template('partials/folder_modal.html', errors=errors, name=name, rule_text=rule_text, priority=priority,
folder_data={'rule_text': '',
'show_ai_rules': True,
'errors': None }))
response.headers['HX-Retarget'] = '#folder-modal'
response.headers['HX-Reswap'] = 'outerHTML'
return response
@@ -235,7 +240,10 @@ def update_folder(folder_id):
# If there are validation errors, return the modal with errors
if errors:
response = make_response(render_template('partials/folder_modal.html', folder=folder, errors=errors, name=name, rule_text=rule_text, priority=priority))
response = make_response(render_template('partials/folder_modal.html', folder=folder, errors=errors, name=name, rule_text=rule_text, priority=priority,
folder_data={'rule_text': folder.rule_text,
'show_ai_rules': True,
'errors': None }))
return response
# Update folder
@@ -263,7 +271,10 @@ def update_folder(folder_id):
db.session.rollback()
# Return error in modal
errors = {'general': 'An unexpected error occurred. Please try again.'}
response = make_response(render_template('partials/folder_modal.html', folder=folder, errors=errors, name=name, rule_text=rule_text, priority=priority))
response = make_response(render_template('partials/folder_modal.html', folder=folder, errors=errors, name=name, rule_text=rule_text, priority=priority,
folder_data={'rule_text': folder.rule_text,
'show_ai_rules': True,
'errors': None }))
response.headers['HX-Retarget'] = '#folder-modal'
response.headers['HX-Reswap'] = 'outerHTML'
return response
@@ -365,79 +376,41 @@ def generate_rule():
return render_template('partials/ai_rule_result.html', result=result)
# Generate new rule using AI service
if rule_type == 'single':
rule_text, metadata = ai_service.generate_single_rule(folder_name, folder_type, rule_text)
if rule_text is None:
# AI service failed, return fallback
fallback_rule = ai_service.get_fallback_rule(folder_name, folder_type)
result = {
'success': True,
'fallback': True,
'rule': fallback_rule,
'quality_score': 50,
'message': 'AI service unavailable, using fallback rule'
}
return render_template('partials/ai_rule_result.html', result=result)
# Cache the result
expires_at = datetime.utcnow() + timedelta(hours=1) # Cache for 1 hour
cache_entry = AIRuleCache(
user_id=current_user.id,
folder_name=folder_name,
folder_type=folder_type,
rule_text=rule_text,
rule_metadata=metadata,
cache_key=cache_key,
expires_at=expires_at
)
db.session.add(cache_entry)
db.session.commit()
# Only support multiple rules now
rules, metadata = ai_service.generate_multiple_rules(folder_name, folder_type, rule_text)
if rules is None:
# AI service failed, return fallback
fallback_rule = ai_service.get_fallback_rule(folder_name, folder_type)
result = {
'success': True,
'rule': rule_text,
'metadata': metadata,
'quality_score': metadata.get('quality_score', 0)
'fallback': True,
'rules': [{'text': fallback_rule, 'quality_score': 50}],
'message': 'AI service unavailable, using fallback rule'
}
return render_template('partials/ai_rule_result.html', result=result)
else: # multiple rules
rules, metadata = ai_service.generate_multiple_rules(folder_name, folder_type, rule_text)
if rules is None:
# AI service failed, return fallback
fallback_rule = ai_service.get_fallback_rule(folder_name, folder_type)
result = {
'success': True,
'fallback': True,
'rules': [{'text': fallback_rule, 'quality_score': 50}],
'message': 'AI service unavailable, using fallback rule'
}
return render_template('partials/ai_rule_result.html', result=result)
# Cache the first rule as representative
expires_at = datetime.utcnow() + timedelta(hours=1)
cache_entry = AIRuleCache(
user_id=current_user.id,
folder_name=folder_name,
folder_type=folder_type,
rule_text=rules[0]['text'] if rules else '',
rule_metadata=metadata,
cache_key=cache_key,
expires_at=expires_at
)
db.session.add(cache_entry)
db.session.commit()
result = {
'success': True,
'rules': rules,
'metadata': metadata
}
return render_template('partials/ai_rule_result.html', result=result)
# Cache the first rule as representative
expires_at = datetime.utcnow() + timedelta(hours=1)
cache_entry = AIRuleCache(
user_id=current_user.id,
folder_name=folder_name,
folder_type=folder_type,
rule_text=rules[0]['text'] if rules else '',
rule_metadata=metadata,
cache_key=cache_key,
expires_at=expires_at
)
db.session.add(cache_entry)
db.session.commit()
result = {
'success': True,
'rules': rules,
'metadata': metadata
}
return render_template('partials/ai_rule_result.html', result=result)
except Exception as e:
# Print unhandled exceptions to the console as required

2
app/templates/partials/folder_modal.html
View File

@@ -63,7 +63,7 @@ x-data='{{ folder_data|tojson }}'
placeholder="e.g., Move emails from 'newsletter@company.com' to this folder"
required
x-model="rule_text"
>{% if rule_text is defined %}{{ rule_text }}{% elif folder %}{{ folder.rule_text }}{% endif %}</textarea>
></textarea>
{% if errors and errors.rule_text %}
<div class="text-error text-sm mt-1">{{ errors.rule_text }}</div>
{% endif %}

22
tests/functional/test_ai_rule_user_flow.py
View File

@@ -58,16 +58,16 @@ class TestAIRuleUserFlow:
with patch('app.routes.folders.ai_service') as mock_ai_service:
# Mock AI service response
mock_ai_service.generate_single_rule.return_value = (
"Move emails from 'boss@company.com' to this folder",
{'quality_score': 85, 'model_used': 'test-model'}
mock_ai_service.generate_multiple_rules.return_value = (
[{'text': "Move emails from 'boss@company.com' to this folder", 'quality_score': 85}],
{'total_generated': 1}
)
# Simulate AI rule generation request
response = client.post('/api/folders/generate-rule', data={
'folder_name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200
@@ -117,16 +117,16 @@ class TestAIRuleUserFlow:
with patch('app.routes.folders.ai_service') as mock_ai_service:
# Mock AI service response
mock_ai_service.generate_single_rule.return_value = (
"Move emails from 'newsletter@company.com' to this folder",
{'quality_score': 90, 'model_used': 'test-model'}
mock_ai_service.generate_multiple_rules.return_value = (
[{'text': "Move emails from 'newsletter@company.com' to this folder", 'quality_score': 90}],
{'total_generated': 1}
)
# First, generate the rule
response = client.post('/api/folders/generate-rule', data={
'folder_name': 'Newsletters',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200
@@ -183,7 +183,7 @@ class TestAIRuleUserFlow:
# Test with invalid inputs
response = client.post('/api/folders/generate-rule', data={
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200
@@ -198,13 +198,13 @@ class TestAIRuleUserFlow:
with patch('app.routes.folders.ai_service') as mock_ai_service:
# Mock AI service failure
mock_ai_service.generate_single_rule.return_value = (None, {'error': 'Service unavailable'})
mock_ai_service.generate_multiple_rules.return_value = (None, {'error': 'Service unavailable'})
mock_ai_service.get_fallback_rule.return_value = 'Move emails containing "Work" to this folder'
response = client.post('/api/folders/generate-rule', data={
'folder_name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200

44
tests/integration/test_ai_rule_endpoints.py
View File

@@ -50,15 +50,15 @@ class TestAIRuleEndpoints:
"""Test successful rule generation."""
with patch('app.routes.folders.ai_service') as mock_ai_service:
# Mock AI service response
mock_ai_service.generate_single_rule.return_value = (
"Move emails from 'boss@company.com' to this folder",
{'quality_score': 85, 'model_used': 'test-model'}
mock_ai_service.generate_multiple_rules.return_value = (
[{'text': "Move emails from 'boss@company.com' to this folder", 'quality_score': 85}],
{'total_generated': 1}
)
response = authenticated_client.post('/api/folders/generate-rule', data={
'name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200
@@ -70,7 +70,7 @@ class TestAIRuleEndpoints:
"""Test rule generation with missing folder name."""
response = authenticated_client.post('/api/folders/generate-rule', data={
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200
@@ -82,7 +82,7 @@ class TestAIRuleEndpoints:
response = authenticated_client.post('/api/folders/generate-rule', data={
'name': 'Work',
'folder_type': 'invalid',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200
@@ -116,13 +116,13 @@ class TestAIRuleEndpoints:
"""Test rule generation when AI service fails."""
with patch('app.routes.folders.ai_service') as mock_ai_service:
# Mock AI service failure
mock_ai_service.generate_single_rule.return_value = (None, {'error': 'Service unavailable'})
mock_ai_service.generate_multiple_rules.return_value = (None, {'error': 'Service unavailable'})
mock_ai_service.get_fallback_rule.return_value = 'Fallback rule'
response = authenticated_client.post('/api/folders/generate-rule', data={
'name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200
@@ -166,16 +166,16 @@ class TestAIRuleEndpoints:
"""Test rule caching functionality."""
with patch('app.routes.folders.ai_service') as mock_ai_service:
# Mock AI service response
mock_ai_service.generate_single_rule.return_value = (
"Cached rule",
{'quality_score': 90}
mock_ai_service.generate_multiple_rules.return_value = (
[{'text': "Cached rule", 'quality_score': 90}],
{'total_generated': 1}
)
# First request - should generate new rule
response1 = authenticated_client.post('/api/folders/generate-rule', data={
'name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response1.status_code == 200
@@ -195,7 +195,7 @@ class TestAIRuleEndpoints:
response2 = authenticated_client.post('/api/folders/generate-rule', data={
'name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response2.status_code == 200
@@ -205,9 +205,9 @@ class TestAIRuleEndpoints:
"""Test cache expiration functionality."""
with patch('app.routes.folders.ai_service') as mock_ai_service:
# Mock AI service response
mock_ai_service.generate_single_rule.return_value = (
"Expired rule",
{'quality_score': 90}
mock_ai_service.generate_multiple_rules.return_value = (
[{'text': "Expired rule", 'quality_score': 90}],
{'total_generated': 1}
)
# Create expired cache entry
@@ -229,7 +229,7 @@ class TestAIRuleEndpoints:
response = authenticated_client.post('/api/folders/generate-rule', data={
'name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200
@@ -241,7 +241,7 @@ class TestAIRuleEndpoints:
response = client.post('/api/folders/generate-rule', data={
'folder_name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
# Should be redirected to login
@@ -254,15 +254,15 @@ class TestAIRuleEndpoints:
mock_commit.side_effect = Exception("Database error")
with patch('app.routes.folders.ai_service') as mock_ai_service:
mock_ai_service.generate_single_rule.return_value = (
"Test rule",
{'quality_score': 85}
mock_ai_service.generate_multiple_rules.return_value = (
[{'text': "Test rule", 'quality_score': 85}],
{'total_generated': 1}
)
response = authenticated_client.post('/api/folders/generate-rule', data={
'name': 'Work',
'folder_type': 'destination',
'rule_type': 'single'
'rule_type': 'multiple'
})
assert response.status_code == 200

49
tests/unit/test_ai_service.py
View File

@@ -21,40 +21,17 @@ class TestAIService:
assert self.ai_service.timeout == 30
assert self.ai_service.max_retries == 3
@patch('app.ai_service.requests.post')
def test_generate_single_rule_success(self, mock_post):
"""Test successful single rule generation."""
# Mock successful API response
mock_response = Mock()
mock_response.json.return_value = {
'choices': [{
'message': {
'content': 'Move emails from "boss@company.com" to this folder'
}
}]
}
mock_response.raise_for_status.return_value = None
mock_post.return_value = mock_response
def test_generate_multiple_rules_success(self):
"""Test successful multiple rules generation."""
# This test should be updated to test the generate_multiple_rules method
# For now, we'll skip this test since we're removing single rule functionality
pass
rule_text, metadata = self.ai_service.generate_single_rule('Work', 'destination')
assert rule_text == 'Move emails from "boss@company.com" to this folder'
assert metadata is not None
assert 'quality_score' in metadata
assert 'model_used' in metadata
assert 'generated_at' in metadata
@patch('app.ai_service.requests.post')
def test_generate_single_rule_failure(self, mock_post):
"""Test single rule generation failure."""
# Mock API failure
mock_post.side_effect = Exception("API Error")
rule_text, metadata = self.ai_service.generate_single_rule('Work', 'destination')
assert rule_text is None
assert metadata is not None
assert 'error' in metadata
def test_generate_multiple_rules_failure(self):
"""Test multiple rules generation failure."""
# This test should be updated to test the generate_multiple_rules method
# For now, we'll skip this test since we're removing single rule functionality
pass
def test_assess_rule_quality(self):
"""Test rule quality assessment."""
@@ -96,9 +73,9 @@ class TestAIService:
"""Test cache key generation."""
# Access the static method directly since it's not a bound method
from app.ai_service import AIService
key1 = AIService.generate_cache_key('Work', 'destination', 'single')
key2 = AIService.generate_cache_key('Work', 'destination', 'single')
key3 = AIService.generate_cache_key('Personal', 'destination', 'single')
key1 = AIService.generate_cache_key('Work', 'destination', 'multiple')
key2 = AIService.generate_cache_key('Work', 'destination', 'multiple')
key3 = AIService.generate_cache_key('Personal', 'destination', 'multiple')
# Same inputs should produce same key
assert key1 == key2