jj

backend/scheduler/apscheduler_service.py

@@ -94,96 +94,98 @@ class APSchedulerService:
     def load_schedules(self):
         """Load schedules from the database and create jobs."""
         try:
-            if not self.supabase_client:
-                logger.error("❌ Supabase client not initialized")
-                return
-            
-            # Fetch all schedules from Supabase
-            response = (
-                self.supabase_client
-                .table("Scheduling")
-                .select("*, Social_network(id_utilisateur, token, sub)")
-                .execute()
-            )
-            
-            schedules = response.data if response.data else []
-            logger.info(f"📋 Found {len(schedules)} schedules in database")
-            
-            # Remove existing scheduled jobs (except the loader job)
-            jobs_to_remove = []
-            for job in self.scheduler.get_jobs():
-                if job.id != 'load_schedules':
-                    jobs_to_remove.append(job.id)
-            
-            for job_id in jobs_to_remove:
-                try:
-                    self.scheduler.remove_job(job_id)
-                except Exception as e:
-                    logger.warning(f"Failed to remove job {job_id}: {str(e)}")
-            
-            # Create jobs for each schedule
-            for schedule in schedules:
-                try:
-                    schedule_id = schedule.get('id')
-                    schedule_time = schedule.get('schedule_time')
-                    adjusted_time = schedule.get('adjusted_time')
-                    
-                    if not schedule_time or not adjusted_time:
-                        logger.warning(f"⚠️ Invalid schedule format for schedule {schedule_id}")
-                        continue
-                    
-                    # Parse timezone information
-                    server_timezone = get_server_timezone()
-                    schedule_time_part, schedule_timezone = parse_timezone_schedule(schedule_time)
-                    adjusted_time_part, adjusted_timezone = parse_timezone_schedule(adjusted_time)
-                    
-                    # Convert to server timezone for APScheduler
-                    if schedule_timezone and validate_timezone(schedule_timezone):
-                        server_schedule_time = convert_time_to_timezone(schedule_time_part, schedule_timezone, server_timezone)
-                        server_adjusted_time = convert_time_to_timezone(adjusted_time_part, adjusted_timezone or schedule_timezone, server_timezone)
-                    else:
-                        # Use original time if no valid timezone
-                        server_schedule_time = schedule_time_part
-                        server_adjusted_time = adjusted_time_part
-                    
-                    # Parse schedule times for server timezone
-                    content_gen_cron = self._parse_schedule_time(server_adjusted_time)
-                    publish_cron = self._parse_schedule_time(server_schedule_time)
-                    
-                    # Create content generation job (5 minutes before publishing)
-                    gen_job_id = f"gen_{schedule_id}"
-                    self.scheduler.add_job(
-                        func=self.generate_content_task,
-                        trigger=CronTrigger(
-                            minute=content_gen_cron['minute'],
-                            hour=content_gen_cron['hour'],
-                            day_of_week=content_gen_cron['day_of_week']
-                        ),
-                        id=gen_job_id,
-                        name=f"Content generation for schedule {schedule_id}",
-                        args=[schedule.get('Social_network', {}).get('id_utilisateur'), schedule_id],
-                        replace_existing=True
-                    )
-                    
-                    # Create publishing job
-                    pub_job_id = f"pub_{schedule_id}"
-                    self.scheduler.add_job(
-                        func=self.publish_post_task,
-                        trigger=CronTrigger(
-                            minute=publish_cron['minute'],
-                            hour=publish_cron['hour'],
-                            day_of_week=publish_cron['day_of_week']
-                        ),
-                        id=pub_job_id,
-                        name=f"Post publishing for schedule {schedule_id}",
-                        args=[schedule_id],
-                        replace_existing=True
-                    )
-                    
-                    logger.info(f"📅 Created schedule jobs for {schedule_id}")
-                    
-                except Exception as e:
-                    logger.error(f"❌ Error creating jobs for schedule {schedule.get('id')}: {str(e)}")
+            # Run within application context
+            with self.app.app_context():
+                if not self.supabase_client:
+                    logger.error("❌ Supabase client not initialized")
+                    return
+                
+                # Fetch all schedules from Supabase
+                response = (
+                    self.supabase_client
+                    .table("Scheduling")
+                    .select("*, Social_network(id_utilisateur, token, sub)")
+                    .execute()
+                )
+                
+                schedules = response.data if response.data else []
+                logger.info(f"📋 Found {len(schedules)} schedules in database")
+                
+                # Remove existing scheduled jobs (except the loader job)
+                jobs_to_remove = []
+                for job in self.scheduler.get_jobs():
+                    if job.id != 'load_schedules':
+                        jobs_to_remove.append(job.id)
+                
+                for job_id in jobs_to_remove:
+                    try:
+                        self.scheduler.remove_job(job_id)
+                    except Exception as e:
+                        logger.warning(f"Failed to remove job {job_id}: {str(e)}")
+                
+                # Create jobs for each schedule
+                for schedule in schedules:
+                    try:
+                        schedule_id = schedule.get('id')
+                        schedule_time = schedule.get('schedule_time')
+                        adjusted_time = schedule.get('adjusted_time')
+                        
+                        if not schedule_time or not adjusted_time:
+                            logger.warning(f"⚠️ Invalid schedule format for schedule {schedule_id}")
+                            continue
+                        
+                        # Parse timezone information
+                        server_timezone = get_server_timezone()
+                        schedule_time_part, schedule_timezone = parse_timezone_schedule(schedule_time)
+                        adjusted_time_part, adjusted_timezone = parse_timezone_schedule(adjusted_time)
+                        
+                        # Convert to server timezone for APScheduler
+                        if schedule_timezone and validate_timezone(schedule_timezone):
+                            server_schedule_time = convert_time_to_timezone(schedule_time_part, schedule_timezone, server_timezone)
+                            server_adjusted_time = convert_time_to_timezone(adjusted_time_part, adjusted_timezone or schedule_timezone, server_timezone)
+                        else:
+                            # Use original time if no valid timezone
+                            server_schedule_time = schedule_time_part
+                            server_adjusted_time = adjusted_time_part
+                        
+                        # Parse schedule times for server timezone
+                        content_gen_cron = self._parse_schedule_time(server_adjusted_time)
+                        publish_cron = self._parse_schedule_time(server_schedule_time)
+                        
+                        # Create content generation job (5 minutes before publishing)
+                        gen_job_id = f"gen_{schedule_id}"
+                        self.scheduler.add_job(
+                            func=self.generate_content_task,
+                            trigger=CronTrigger(
+                                minute=content_gen_cron['minute'],
+                                hour=content_gen_cron['hour'],
+                                day_of_week=content_gen_cron['day_of_week']
+                            ),
+                            id=gen_job_id,
+                            name=f"Content generation for schedule {schedule_id}",
+                            args=[schedule.get('Social_network', {}).get('id_utilisateur'), schedule_id],
+                            replace_existing=True
+                        )
+                        
+                        # Create publishing job
+                        pub_job_id = f"pub_{schedule_id}"
+                        self.scheduler.add_job(
+                            func=self.publish_post_task,
+                            trigger=CronTrigger(
+                                minute=publish_cron['minute'],
+                                hour=publish_cron['hour'],
+                                day_of_week=publish_cron['day_of_week']
+                            ),
+                            id=pub_job_id,
+                            name=f"Post publishing for schedule {schedule_id}",
+                            args=[schedule_id],
+                            replace_existing=True
+                        )
+                        
+                        logger.info(f"📅 Created schedule jobs for {schedule_id}")
+                        
+                    except Exception as e:
+                        logger.error(f"❌ Error creating jobs for schedule {schedule.get('id')}: {str(e)}")
             
         except Exception as e:
             logger.error(f"❌ Error loading schedules: {str(e)}")
@@ -239,44 +241,46 @@ class APSchedulerService:
         try:
             logger.info(f"🎨 Generating content for schedule {schedule_id}")
             
-            # Initialize content service
-            content_service = ContentService()
-            
-            # Generate content using content service
-            generated_content = content_service.generate_post_content(user_id)
-            
-            # Store generated content in database
-            # We need to get the social account ID from the schedule
-            schedule_response = (
-                self.supabase_client
-                .table("Scheduling")
-                .select("id_social")
-                .eq("id", schedule_id)
-                .execute()
-            )
-            
-            if not schedule_response.data:
-                raise Exception(f"Schedule {schedule_id} not found")
+            # Run within application context
+            with self.app.app_context():
+                # Initialize content service
+                content_service = ContentService()
                 
-            social_account_id = schedule_response.data[0]['id_social']
-            
-            # Store the generated content
-            response = (
-                self.supabase_client
-                .table("Post_content")
-                .insert({
-                    "social_account_id": social_account_id,
-                    "Text_content": generated_content,
-                    "is_published": False,
-                    "sched": schedule_id
-                })
-                .execute()
-            )
-            
-            if response.data:
-                logger.info(f"✅ Content generated and stored for schedule {schedule_id}")
-            else:
-                logger.error(f"❌ Failed to store generated content for schedule {schedule_id}")
+                # Generate content using content service
+                generated_content = content_service.generate_post_content(user_id)
+                
+                # Store generated content in database
+                # We need to get the social account ID from the schedule
+                schedule_response = (
+                    self.supabase_client
+                    .table("Scheduling")
+                    .select("id_social")
+                    .eq("id", schedule_id)
+                    .execute()
+                )
+                
+                if not schedule_response.data:
+                    raise Exception(f"Schedule {schedule_id} not found")
+                    
+                social_account_id = schedule_response.data[0]['id_social']
+                
+                # Store the generated content
+                response = (
+                    self.supabase_client
+                    .table("Post_content")
+                    .insert({
+                        "social_account_id": social_account_id,
+                        "Text_content": generated_content,
+                        "is_published": False,
+                        "sched": schedule_id
+                    })
+                    .execute()
+                )
+                
+                if response.data:
+                    logger.info(f"✅ Content generated and stored for schedule {schedule_id}")
+                else:
+                    logger.error(f"❌ Failed to store generated content for schedule {schedule_id}")
                 
         except Exception as e:
             logger.error(f"❌ Error in content generation task for schedule {schedule_id}: {str(e)}")
@@ -291,63 +295,65 @@ class APSchedulerService:
         try:
             logger.info(f"🚀 Publishing post for schedule {schedule_id}")
             
-            # Fetch the post to publish
-            response = (
-                self.supabase_client
-                .table("Post_content")
-                .select("*")
-                .eq("sched", schedule_id)
-                .eq("is_published", False)
-                .order("created_at", desc=True)
-                .limit(1)
-                .execute()
-            )
-            
-            if not response.data:
-                logger.info(f"📭 No unpublished posts found for schedule {schedule_id}")
-                return
-            
-            post = response.data[0]
-            post_id = post.get('id')
-            text_content = post.get('Text_content')
-            image_url = post.get('image_content_url')
-            
-            # Get social network credentials
-            schedule_response = (
-                self.supabase_client
-                .table("Scheduling")
-                .select("Social_network(token, sub)")
-                .eq("id", schedule_id)
-                .execute()
-            )
-            
-            if not schedule_response.data:
-                raise Exception(f"Schedule {schedule_id} not found")
+            # Run within application context
+            with self.app.app_context():
+                # Fetch the post to publish
+                response = (
+                    self.supabase_client
+                    .table("Post_content")
+                    .select("*")
+                    .eq("sched", schedule_id)
+                    .eq("is_published", False)
+                    .order("created_at", desc=True)
+                    .limit(1)
+                    .execute()
+                )
                 
-            social_network = schedule_response.data[0].get('Social_network', {})
-            access_token = social_network.get('token')
-            user_sub = social_network.get('sub')
-            
-            if not access_token or not user_sub:
-                logger.error(f"❌ Missing social network credentials for schedule {schedule_id}")
-                return
-            
-            # Publish to LinkedIn
-            linkedin_service = LinkedInService()
-            publish_response = linkedin_service.publish_post(
-                access_token, user_sub, text_content, image_url
-            )
-            
-            # Update post status in database
-            update_response = (
-                self.supabase_client
-                .table("Post_content")
-                .update({"is_published": True})
-                .eq("id", post_id)
-                .execute()
-            )
-            
-            logger.info(f"✅ Post published successfully for schedule {schedule_id}")
+                if not response.data:
+                    logger.info(f"📭 No unpublished posts found for schedule {schedule_id}")
+                    return
+                
+                post = response.data[0]
+                post_id = post.get('id')
+                text_content = post.get('Text_content')
+                image_url = post.get('image_content_url')
+                
+                # Get social network credentials
+                schedule_response = (
+                    self.supabase_client
+                    .table("Scheduling")
+                    .select("Social_network(token, sub)")
+                    .eq("id", schedule_id)
+                    .execute()
+                )
+                
+                if not schedule_response.data:
+                    raise Exception(f"Schedule {schedule_id} not found")
+                    
+                social_network = schedule_response.data[0].get('Social_network', {})
+                access_token = social_network.get('token')
+                user_sub = social_network.get('sub')
+                
+                if not access_token or not user_sub:
+                    logger.error(f"❌ Missing social network credentials for schedule {schedule_id}")
+                    return
+                
+                # Publish to LinkedIn
+                linkedin_service = LinkedInService()
+                publish_response = linkedin_service.publish_post(
+                    access_token, user_sub, text_content, image_url
+                )
+                
+                # Update post status in database
+                update_response = (
+                    self.supabase_client
+                    .table("Post_content")
+                    .update({"is_published": True})
+                    .eq("id", post_id)
+                    .execute()
+                )
+                
+                logger.info(f"✅ Post published successfully for schedule {schedule_id}")
             
         except Exception as e:
             logger.error(f"❌ Error in publishing task for schedule {schedule_id}: {str(e)}")