chore: Update Docker configuration files and workflows

Author: httpdss

.gitignore

@@ -2,3 +2,4 @@
 __pycache__
 *.egg-info
 .env
+*.log

docker-compose.yaml

@@ -1,18 +1,20 @@
-version: '3.8'
+name: struct
 
 services:
   struct:
     build: .
     volumes:
       - .:/app
     entrypoint: ["python", "struct_module/main.py"]
+    env_file:
+      - .env
     command: [
       "--log=DEBUG",
       "--dry-run",
       "--vars=project_name=MyProject,author_name=JohnDoe",
       "--backup=/app/backup",
       "--file-strategy=rename",
       "--log-file=/app/logfile.log",
-      "/app/project_structure.yaml",
-      "/app/project"
+      "/app/example/structure.yaml",
+      "/app/example_project"
     ]

example/structure.yaml

@@ -11,5 +11,5 @@ structure:
   - LICENSE:
       file: https://raw.githubusercontent.com/nishanths/license/master/LICENSE
   - .gitignore:
-      prompt: |
+      user_prompt: |
         Generate the content for a .gitignore file that is appropriate for a Python project. Include common directories and file types that should be ignored.

struct_module/main.py

@@ -5,35 +5,64 @@
 from string import Template
 import time
 import yaml
-import openai
+from openai import OpenAI
 from dotenv import load_dotenv
 
 load_dotenv()
 
 openai_api_key = os.getenv("OPENAI_API_KEY")
+openai_model = os.getenv("OPENAI_MODEL")
 
 if not openai_api_key:
-    raise ValueError("OpenAI API key not found. Please set it in the .env file.")
-
-openai.api_key = openai_api_key
+    logging.warning("OpenAI API key not found. Skipping processing prompt.")
 
 class FileItem:
     def __init__(self, properties):
         self.name = properties.get("name")
         self.content = properties.get("content")
         self.remote_location = properties.get("file")
         self.permissions = properties.get("permissions")
-        self.prompt = properties.get("prompt")
-
-    def process_prompt(self):
-        if self.prompt:
-            logging.debug(f"Processing prompt: {self.prompt}")
-            response = openai.Completion.create(
-                engine="davinci",
-                prompt=self.prompt,
-                max_tokens=100
+
+        self.system_prompt = properties.get("system_prompt")
+        self.user_prompt = properties.get("user_prompt")
+        self.openai_client = OpenAI(
+            api_key=openai_api_key
+        )
+
+        if not openai_model:
+            logging.info("OpenAI model not found. Using default model.")
+            self.openai_model = "gpt-3.5-turbo"
+        else:
+            logging.debug(f"Using OpenAI model: {openai_model}")
+            self.openai_model = openai_model
+
+    def process_prompt(self, dry_run=False):
+        if self.user_prompt:
+            logging.debug(f"Using user prompt: {self.user_prompt}")
+
+            if not openai_api_key:
+                logging.warning("Skipping processing prompt as OpenAI API key is not set.")
+                return
+
+            if not self.system_prompt:
+                system_prompt = "You are a software developer working on a project. You need to create a file with the following content:"
+            else:
+                system_prompt = self.system_prompt
+
+            if dry_run:
+                logging.info("[DRY RUN] Would generate content using OpenAI API.")
+                self.content = "[DRY RUN] Generating content using OpenAI"
+                return
+
+            completion = self.openai_client.chat.completions.create(
+                model=self.openai_model,
+                messages=[
+                    {"role": "system", "content": system_prompt},
+                    {"role": "user", "content": self.user_prompt}
+                ]
             )
-            self.content = response.choices[0].text
+
+            self.content = completion.choices[0].message.content
             logging.debug(f"Generated content: {self.content}")
 
     def fetch_content(self):
@@ -94,8 +123,8 @@ def validate_configuration(structure):
                 raise ValueError("Each name in the 'structure' item must be a string.")
             if isinstance(content, dict):
                 # Check that any of the keys 'content', 'file' or 'prompt' is present
-                if 'content' not in content and 'file' not in content and 'prompt' not in content:
-                    raise ValueError(f"Dictionary item '{name}' must contain either 'content' or 'file' or 'prompt' key.")
+                if 'content' not in content and 'file' not in content and 'user_prompt' not in content:
+                    raise ValueError(f"Dictionary item '{name}' must contain either 'content' or 'file' or 'user_prompt' key.")
                 # Check if 'file' key is present and its value is a string
                 if 'file' in content and not isinstance(content['file'], str):
                     raise ValueError(f"The 'file' value for '{name}' must be a string.")
@@ -125,7 +154,7 @@ def create_structure(base_path, structure, dry_run=False, template_vars=None, ba
                 file_item = FileItem({"name": name, "content": content})
 
             file_item.apply_template_variables(template_vars)
-            file_item.process_prompt()
+            file_item.process_prompt(dry_run)
             file_item.create(base_path, dry_run, backup_path, file_strategy)
 
 def main():

tests/__init__.py

@@ -8,6 +8,12 @@
 from unittest.mock import patch, MagicMock
 from struct_module.main import FileItem, validate_configuration, create_structure
 
+# Mock the environment variables for OpenAI
+@pytest.fixture(autouse=True)
+def mock_env_vars(monkeypatch):
+    monkeypatch.setenv("OPENAI_API_KEY", "test-api-key")
+    monkeypatch.setenv("OPENAI_MODEL", "gpt-3.5-turbo")
+
 # Test for FileItem.fetch_content
 @patch('struct_module.requests.get')
 def test_fetch_remote_content(mock_get):