fusesell 1.2.8__py3-none-any.whl → 1.2.9__py3-none-any.whl

{fusesell-1.2.8.dist-info → fusesell-1.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fusesell
-Version: 1.2.8
+Version: 1.2.9
 Summary: Local implementation of FuseSell AI sales automation pipeline
 Author-email: FuseSell Team <team@fusesell.ai>
 License-Expression: MIT

{fusesell-1.2.8.dist-info → fusesell-1.2.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 fusesell.py,sha256=t5PjkhWEJGINp4k517u0EX0ge7lzuHOUHHro-BE1mGk,596
-fusesell-1.2.8.dist-info/licenses/LICENSE,sha256=GDz1ZoC4lB0kwjERpzqc_OdA_awYVso2aBnUH-ErW_w,1070
-fusesell_local/__init__.py,sha256=ORlqpW5kTRov-Xw9f3Bk0L7wy1Q5bxTdaZAT9fIhLcQ,966
+fusesell-1.2.9.dist-info/licenses/LICENSE,sha256=GDz1ZoC4lB0kwjERpzqc_OdA_awYVso2aBnUH-ErW_w,1070
+fusesell_local/__init__.py,sha256=Ajbk9gus0-G2gR6WAo1F_QTApGpLzz01I2LL2iE6t8c,967
 fusesell_local/api.py,sha256=AcPune5YJdgi7nsMeusCUqc49z5UiycsQb6n3yiV_No,10839
 fusesell_local/cli.py,sha256=MYnVxuEf5KTR4VcO3sc-VtP9NkWlSixJsYfOWST2Ds0,65859
 fusesell_local/pipeline.py,sha256=RMF_kgwNEc1ka8-CDJyzIOTSo8PGtR_zPKAgRevhlNo,39913
@@ -12,7 +12,7 @@ fusesell_local/stages/base_stage.py,sha256=ldo5xuHZto7ceEg3i_3rxAx0xPccK4n2jaxEJ
 fusesell_local/stages/data_acquisition.py,sha256=Td3mwakJRoEYbi3od4v2ZzKOHLgLSgccZVxH3ezs1_4,71081
 fusesell_local/stages/data_preparation.py,sha256=XWLg9b1w2NrMxLcrWDqB95mRmLQmVIMXpKNaBNr98TQ,52751
 fusesell_local/stages/follow_up.py,sha256=H9Xek6EoIbHrerQvGTRswXDNFH6zq71DcRxxj0zpo2g,77747
-fusesell_local/stages/initial_outreach.py,sha256=0JJMRtfvy1F83Z5anLm8b0634q4JXoFi__IxginPURw,120643
+fusesell_local/stages/initial_outreach.py,sha256=yoXAVaPgQXZc3bMq4U363Z4ARTsnSzOqbodKB3tke3A,123593
 fusesell_local/stages/lead_scoring.py,sha256=ir3l849eMGrGLf0OYUcmA1F3FwyYhAplS4niU3R2GRY,60658
 fusesell_local/tests/conftest.py,sha256=TWUtlP6cNPVOYkTPz-j9BzS_KnXdPWy8D-ObPLHvXYs,366
 fusesell_local/tests/test_api.py,sha256=763rUVb5pAuAQOovug6Ka0T9eGK8-WVOC_J08M7TETo,1827
@@ -23,13 +23,13 @@ fusesell_local/tests/test_data_manager_teams.py,sha256=kjk4V4r9ja4EVREIiQMxkuZd4
 fusesell_local/utils/__init__.py,sha256=TVemlo0wpckhNUxP3a1Tky3ekswy8JdIHaXBlkKXKBQ,330
 fusesell_local/utils/birthday_email_manager.py,sha256=NKLoUyzPedyhewZPma21SOoU8p9wPquehloer7TRA9U,20478
 fusesell_local/utils/data_manager.py,sha256=60CLOVkVB76AQx1wQyja0PFmA1t-YJITiGNni14IPOs,188449
-fusesell_local/utils/event_scheduler.py,sha256=YwWIdkvRdWFdDLX-sepI5AXJOhEIullIclpk9njvZAA,38577
+fusesell_local/utils/event_scheduler.py,sha256=tP-rnx9Hixfcm6ZTqloLy_EgSPII89v5dSycRHrCTLE,39824
 fusesell_local/utils/llm_client.py,sha256=FVc25UlGt6hro7h5Iw7PHSXY3E3_67Xc-SUbHuMSRs0,10437
 fusesell_local/utils/logger.py,sha256=sWlV8Tjyz_Z8J4zXKOnNalh8_iD6ytfrwPZpD-wcEOs,6259
 fusesell_local/utils/timezone_detector.py,sha256=0cAE4c8ZXqCA8AvxRKm6PrFKmAmsbq3HOHR6w-mW3KQ,39997
 fusesell_local/utils/validators.py,sha256=Z1VzeoxFsnuzlIA_ZaMWoy-0Cgyqupd47kIdljlMDbs,15438
-fusesell-1.2.8.dist-info/METADATA,sha256=9r91NKwHYUIJ-FiYGr7JoNsWe5dDLMd0JO6Nf8MlXW0,35074
-fusesell-1.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fusesell-1.2.8.dist-info/entry_points.txt,sha256=Vqek7tbiX7iF4rQkCRBZvT5WrB0HUduqKTsI2ZjhsXo,53
-fusesell-1.2.8.dist-info/top_level.txt,sha256=VP9y1K6DEq6gNq2UgLd7ChujxViF6OzeAVCK7IUBXPA,24
-fusesell-1.2.8.dist-info/RECORD,,
+fusesell-1.2.9.dist-info/METADATA,sha256=lsdyRarHbom144vFp0amieA9fQuDQF3-ZL9H-5A04DY,35074
+fusesell-1.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fusesell-1.2.9.dist-info/entry_points.txt,sha256=Vqek7tbiX7iF4rQkCRBZvT5WrB0HUduqKTsI2ZjhsXo,53
+fusesell-1.2.9.dist-info/top_level.txt,sha256=VP9y1K6DEq6gNq2UgLd7ChujxViF6OzeAVCK7IUBXPA,24
+fusesell-1.2.9.dist-info/RECORD,,

fusesell_local/__init__.py

@@ -32,6 +32,6 @@ __all__ = [
     "validate_config",
 ]
 
-__version__ = "1.2.8"
+__version__ = "1.2.9"
 __author__ = "FuseSell Team"
 __description__ = "Local implementation of FuseSell AI sales automation pipeline"

fusesell_local/stages/initial_outreach.py

@@ -904,6 +904,7 @@ class InitialOutreachStage(BaseStage):
                 first_name = name_parts[0]
         else:
             first_name = contact_name or ''
+        context.setdefault('customer_first_name', first_name or contact_name or '')
 
         action = input_data.get('action', 'draft_write')
         action_labels = {
@@ -1044,7 +1045,7 @@ class InitialOutreachStage(BaseStage):
                 return rep
         return reps[0] if reps else {}
 
-    def _sanitize_email_body(self, html: str, staff_name: str, rep_profile: Dict[str, Any]) -> str:
+    def _sanitize_email_body(self, html: str, staff_name: str, rep_profile: Dict[str, Any], customer_first_name: str) -> str:
         if not html:
             return ''
 
@@ -1065,12 +1066,84 @@ class InitialOutreachStage(BaseStage):
             else:
                 html = html.replace(placeholder, '')
 
-        # Remove any lingering placeholder fragments such as "[Your LinkedIn Profile"
         html = re.sub(r'\[Your[^<\]]+\]?', '', html, flags=re.IGNORECASE)
-        # Collapse empty paragraphs created by placeholder removal
+
+        if '<p' not in html.lower():
+            lines = [line.strip() for line in html.splitlines() if line.strip()]
+            if lines:
+                html = ''.join(f'<p>{line}</p>' for line in lines)
+
+        html = self._deduplicate_greeting(html, customer_first_name or '')
         html = re.sub(r'(<p>\s*</p>)+', '', html, flags=re.IGNORECASE)
         return html
 
+    def _deduplicate_greeting(self, html: str, customer_first_name: str) -> str:
+        paragraphs = re.findall(r'(<p.*?>.*?</p>)', html, flags=re.IGNORECASE | re.DOTALL)
+        if not paragraphs:
+            return html
+
+        greeting_seen = False
+        cleaned: List[str] = []
+        for para in paragraphs:
+            text = self._strip_html_tags(para).strip()
+            normalized_para = para
+            if self._looks_like_greeting(text):
+                normalized_para = self._standardize_greeting_paragraph(para, customer_first_name)
+                if greeting_seen:
+                    continue
+                greeting_seen = True
+            cleaned.append(normalized_para)
+
+        remainder = re.sub(r'(<p.*?>.*?</p>)', '__PARA__', html, flags=re.IGNORECASE | re.DOTALL)
+        rebuilt = ''
+        idx = 0
+        for segment in remainder.split('__PARA__'):
+            rebuilt += segment
+            if idx < len(cleaned):
+                rebuilt += cleaned[idx]
+                idx += 1
+        if idx < len(cleaned):
+            rebuilt += ''.join(cleaned[idx:])
+        return rebuilt
+
+    def _looks_like_greeting(self, text: str) -> bool:
+        lowered = text.lower().replace('\xa0', ' ').strip()
+        return lowered.startswith(('hi ', 'hello ', 'dear '))
+
+    def _standardize_greeting_paragraph(self, paragraph_html: str, customer_first_name: str) -> str:
+        text = self._strip_html_tags(paragraph_html).strip()
+        lowered = text.lower()
+        first_word = next((candidate.title() for candidate in ('dear', 'hello', 'hi') if lowered.startswith(candidate)), 'Hi')
+
+        if customer_first_name:
+            greeting = f"{first_word} {customer_first_name},"
+        else:
+            greeting = f"{first_word} there,"
+
+        remainder = ''
+        match = re.match(r' *(hi|hello|dear)\b[^,]*,(.*)', text, flags=re.IGNORECASE | re.DOTALL)
+        if match:
+            remainder = match.group(2).lstrip()
+        elif lowered.startswith(('hi', 'hello', 'dear')):
+            parts = text.split(',', 1)
+            if len(parts) > 1:
+                remainder = parts[1].lstrip()
+        else:
+            remainder = text[len(text.split(' ', 1)[0]):].lstrip()
+
+        if remainder:
+            sanitized_text = f"{greeting} {remainder}".strip()
+        else:
+            sanitized_text = greeting
+
+        return re.sub(
+            r'(<p.*?>).*?(</p>)',
+            lambda m: f"{m.group(1)}{sanitized_text}{m.group(2)}",
+            paragraph_html,
+            count=1,
+            flags=re.IGNORECASE | re.DOTALL
+        )
+
     def _extract_first_name(self, full_name: str) -> str:
         if not full_name:
             return ''
@@ -1177,7 +1250,8 @@ class InitialOutreachStage(BaseStage):
         message_type = entry.get('message_type') or 'Email'
         rep_profile = getattr(self, '_active_rep_profile', {}) or {}
         staff_name = context.get('input_data', {}).get('staff_name') or self.config.get('staff_name', 'Sales Team')
-        email_body = self._sanitize_email_body(email_body, staff_name, rep_profile)
+        first_name = context.get('customer_first_name') or context.get('input_data', {}).get('customer_name') or ''
+        email_body = self._sanitize_email_body(email_body, staff_name, rep_profile, first_name)
 
         metadata = {
             'customer_company': customer_data.get('companyInfo', {}).get('name', 'Unknown'),

fusesell_local/utils/event_scheduler.py

@@ -84,6 +84,7 @@ class EventScheduler:
                     status TEXT NOT NULL,
                     task TEXT NOT NULL,
                     cron TEXT NOT NULL,
+                    cron_ts INTEGER,
                     room_id TEXT,
                     tags TEXT,
                     customextra TEXT,
@@ -115,6 +116,11 @@ class EventScheduler:
                 CREATE INDEX IF NOT EXISTS idx_reminder_task_cron 
                 ON reminder_task(cron)
             """)
+
+            cursor.execute("PRAGMA table_info(reminder_task)")
+            columns = {row[1] for row in cursor.fetchall()}
+            if 'cron_ts' not in columns:
+                cursor.execute("ALTER TABLE reminder_task ADD COLUMN cron_ts INTEGER")
             
             conn.commit()
             conn.close()
@@ -191,6 +197,19 @@ class EventScheduler:
         except ValueError:
             return value_str
 
+    def _to_unix_timestamp(self, value: Union[str, datetime, None]) -> Optional[int]:
+        """
+        Convert a datetime-like value to a Unix timestamp (seconds).
+        """
+        iso_value = self._format_datetime(value)
+        try:
+            parsed = datetime.fromisoformat(iso_value)
+        except ValueError:
+            return None
+        if parsed.tzinfo is None:
+            parsed = parsed.replace(tzinfo=timezone.utc)
+        return int(parsed.timestamp())
+
     def _build_reminder_payload(
         self,
         base_context: Dict[str, Any],
@@ -296,11 +315,13 @@ class EventScheduler:
 
         cron_value = self._format_datetime(cron_value or send_time)
         scheduled_time_str = self._format_datetime(scheduled_time_value or send_time)
+        cron_ts = self._to_unix_timestamp(cron_value)
 
         return {
             'status': status,
             'task': task_label,
             'cron': cron_value,
+            'cron_ts': cron_ts,
             'room_id': room_id,
             'tags': tags,
             'customextra': customextra,
@@ -346,15 +367,20 @@ class EventScheduler:
             conn = sqlite3.connect(self.main_db_path)
             cursor = conn.cursor()
 
+            cron_ts = payload.get('cron_ts')
+            if cron_ts is None:
+                cron_ts = self._to_unix_timestamp(payload.get('cron'))
+
             cursor.execute("""
                 INSERT INTO reminder_task
-                (id, status, task, cron, room_id, tags, customextra, org_id, customer_id, task_id, import_uuid, scheduled_time)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                (id, status, task, cron, cron_ts, room_id, tags, customextra, org_id, customer_id, task_id, import_uuid, scheduled_time)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             """, (
                 reminder_id,
                 payload.get('status', 'published'),
                 payload.get('task') or 'FuseSell Reminder',
                 self._format_datetime(payload.get('cron')),
+                cron_ts,
                 payload.get('room_id'),
                 tags_str,
                 customextra_str,
@@ -455,6 +481,7 @@ class EventScheduler:
                     draft_id=draft_id,
                     customer_timezone=customer_timezone
                 )
+                reminder_payload.setdefault('cron_ts', self._to_unix_timestamp(reminder_payload.get('cron')))
                 reminder_task_id = self._insert_reminder_task(reminder_payload)
 
             # Log the scheduling
@@ -585,6 +612,7 @@ class EventScheduler:
                     draft_id=original_draft_id,
                     customer_timezone=event_data['customer_timezone']
                 )
+                reminder_payload.setdefault('cron_ts', self._to_unix_timestamp(reminder_payload.get('cron')))
                 reminder_task_id = self._insert_reminder_task(reminder_payload)
             
             self.logger.info(f"Scheduled follow-up event {followup_event_id} for {follow_up_time}")
@@ -834,18 +862,18 @@ class EventScheduler:
             
             # Convert to list of dictionaries
             events = []
-            for row in rows:
-                event = dict(zip(columns, row))
-                # Parse event_data JSON
-                if event['event_data']:
-                    try:
-                        event['event_data'] = json.loads(event['event_data'])
-                    except json.JSONDecodeError:
-                        pass
-                events.append(event)
-            
-            return events
-            
+            for row in rows:
+                event = dict(zip(columns, row))
+                # Parse event_data JSON
+                if event['event_data']:
+                    try:
+                        event['event_data'] = json.loads(event['event_data'])
+                    except json.JSONDecodeError:
+                        pass
+                events.append(event)
+            
+            return events
+            
         except Exception as e:
             self.logger.error(f"Failed to get scheduled events: {str(e)}")
             return []