diff --git a/core/__pycache__/posterGen.cpython-312.pyc b/core/__pycache__/posterGen.cpython-312.pyc index 458ef97..3c2255e 100644 Binary files a/core/__pycache__/posterGen.cpython-312.pyc and b/core/__pycache__/posterGen.cpython-312.pyc differ diff --git a/main.py b/main.py index 7428c80..3997178 100644 --- a/main.py +++ b/main.py @@ -148,7 +148,6 @@ def generate_content_and_posters_step(config, run_id, topics_list, output_handle poster_variants = config.get("variants", 1) # 通常与 content variants 相同 poster_assets_dir = config.get("poster_assets_base_dir") img_base_dir = config.get("image_base_dir") - mod_img_subdir = config.get("modify_image_subdir", "modify") res_dir_config = config.get("resource_dir", []) poster_size = tuple(config.get("poster_target_size", [900, 1200])) txt_possibility = config.get("text_possibility", 0.3) @@ -157,7 +156,6 @@ def generate_content_and_posters_step(config, run_id, topics_list, output_handle collage_subdir = config.get("output_collage_subdir", "collage_img") poster_subdir = config.get("output_poster_subdir", "poster") poster_filename = config.get("output_poster_filename", "poster.jpg") - cam_img_subdir = config.get("camera_image_subdir", "相机") poster_content_system_prompt = config.get("poster_content_system_prompt", None) # 检查关键路径是否存在 @@ -179,7 +177,6 @@ def generate_content_and_posters_step(config, run_id, topics_list, output_handle variants=poster_variants, poster_assets_base_dir=poster_assets_dir, image_base_dir=img_base_dir, - modify_image_subdir=mod_img_subdir, resource_dir_config=res_dir_config, poster_target_size=poster_size, text_possibility=txt_possibility, @@ -188,7 +185,6 @@ def generate_content_and_posters_step(config, run_id, topics_list, output_handle output_collage_subdir=collage_subdir, output_poster_subdir=poster_subdir, output_poster_filename=poster_filename, - camera_image_subdir=cam_img_subdir, system_prompt=poster_content_system_prompt ) if posters_attempted: diff --git a/poster_gen_config.json b/poster_gen_config.json index b091931..6718ed1 100644 --- a/poster_gen_config.json +++ b/poster_gen_config.json @@ -42,9 +42,6 @@ "output_dir": "./result", "image_base_dir": "/root/autodl-tmp/TravelContentCreator/hotel_img", "poster_assets_base_dir": "/root/autodl-tmp/poster_baseboard_0403", - "camera_image_subdir": "", - "modify_image_subdir": "", - "request_timeout": 210, "max_retries": 3, "description_filename": "description.txt", diff --git a/utils/__pycache__/tweet_generator.cpython-312.pyc b/utils/__pycache__/tweet_generator.cpython-312.pyc index 79d3e87..d54f51e 100644 Binary files a/utils/__pycache__/tweet_generator.cpython-312.pyc and b/utils/__pycache__/tweet_generator.cpython-312.pyc differ diff --git a/utils/poster_generator.py b/utils/poster_generator.py deleted file mode 100644 index e69de29..0000000 diff --git a/utils/tweet_generator.py b/utils/tweet_generator.py index 2a6eecc..4ac2537 100644 --- a/utils/tweet_generator.py +++ b/utils/tweet_generator.py @@ -444,7 +444,6 @@ def generate_posters_for_topic(topic_item: dict, variants: int, poster_assets_base_dir: str, image_base_dir: str, - modify_image_subdir: str, img_frame_possibility: float, text_bg_possibility: float, resource_dir_config: list, @@ -453,7 +452,6 @@ def generate_posters_for_topic(topic_item: dict, output_collage_subdir: str, output_poster_subdir: str, output_poster_filename: str, - camera_image_subdir: str, system_prompt: str ): """Generates all posters for a single topic item, handling image data via OutputHandler. @@ -466,14 +464,14 @@ def generate_posters_for_topic(topic_item: dict, variants: Number of variants. poster_assets_base_dir: Path to poster assets (fonts, frames etc.). image_base_dir: Base path for source images. - modify_image_subdir: Subdirectory for modified images. + img_frame_possibility: Probability of adding image frame. + text_bg_possibility: Probability of adding text background. resource_dir_config: Configuration for resource directories (used for Description). poster_target_size: Target size tuple (width, height) for the poster. text_possibility: Probability of adding secondary text. output_collage_subdir: Subdirectory name for saving collages. output_poster_subdir: Subdirectory name for saving posters. output_poster_filename: Filename for the final poster. - camera_image_subdir: Subdirectory for camera images (currently unused in logic?). system_prompt: System prompt for content generation. output_handler: An instance of OutputHandler to process results. @@ -543,7 +541,7 @@ def generate_posters_for_topic(topic_item: dict, return False # Construct and check INPUT image paths - input_img_dir_path = os.path.join(image_base_dir, modify_image_subdir, object_name) + input_img_dir_path = os.path.join(image_base_dir, object_name) if not os.path.exists(input_img_dir_path) or not os.path.isdir(input_img_dir_path): logging.warning(f"Warning: Modify Image directory not found or not a directory: '{input_img_dir_path}'. Skipping posters for this topic.") return False