scriptmonkey 1.0.1__tar.gz → 1.0.3__tar.gz

{scriptmonkey-1.0.1 → scriptmonkey-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scriptmonkey
-Version: 1.0.1
+Version: 1.0.3
 Summary: A Python package that generates complex Python projects and fixes errors in your code using OpenAI's GPT API.
 Home-page: https://github.com/lukerbs/ScriptMonkey
 Author: Luke Kerbs

{scriptmonkey-1.0.1 → scriptmonkey-1.0.3}/scriptmonkey/core.py

@@ -228,9 +228,15 @@ def generate_project_structure(description: str) -> ProjectStructureResponse:
     return project_structure
 
 
-def create_project_structure(project_structure_response: dict, base_directory: str = "./generated_project"):
-    """Creates the directories and files for the project and generates code content for code files."""
-    for project_file in project_structure_response["files"]:
+def create_project_structure(
+    project_structure_response: dict, project_description: str, base_directory: str = "./generated_project"
+):
+    """Creates the directories and files for the project and generates code content for all file types."""
+    # Extract the list of project files for context
+    project_files = project_structure_response["files"]
+
+    # Iterate through each file in the project structure
+    for project_file in project_files:
         file_path = os.path.join(base_directory, project_file["path"].lstrip("/"))
 
         # Check if it's a directory or file (directories end with '/')
@@ -240,23 +246,16 @@ def create_project_structure(project_structure_response: dict, base_directory: s
         else:
             os.makedirs(os.path.dirname(file_path), exist_ok=True)
 
-            # If it's a Python code file, generate code and write to the file
-            if file_path.endswith(".py"):
-                generated_code = generate_code_for_file(project_file)
-                if not os.path.exists(file_path):
-                    with open(file_path, "w") as f:
-                        f.write(generated_code)
-                    print(f"🐒 ScriptMonkey created file with generated code at: '{file_path}'.")
-                else:
-                    print(f"File already exists, skipping: {file_path}")
+            # Generate content for all files, including Python, HTML, JSON, CSS, etc.
+            generated_content = generate_code_for_file(project_file, project_description, project_files)
+
+            # Write the generated content to the file if it doesn't already exist
+            if not os.path.exists(file_path):
+                with open(file_path, "w") as f:
+                    f.write(generated_content)
+                print(f"🐒 ScriptMonkey created file with generated content at: '{file_path}'.")
             else:
-                # Create other file types (HTML, CSS, etc.)
-                if not os.path.exists(file_path):
-                    with open(file_path, "w") as f:
-                        pass  # Create an empty file for non-code files
-                    print(f"🐒 ScriptMonkey reated file: {file_path}")
-                else:
-                    print(f"File already exists, skipping: {file_path}")
+                print(f"File already exists, skipping: {file_path}")
 
 
 def gather_project_context(project_description: str, project_files: list) -> str:
@@ -284,29 +283,39 @@ def gather_project_context(project_description: str, project_files: list) -> str
 
 def generate_code_for_file(file_description: dict, project_description: str, project_files: list) -> str:
     """
-    Generates code content for a given file based on its description using the chatgpt() function.
+    Generates content for a given file based on its description using the chatgpt() function.
 
     Args:
-        file_description (dict): The description of the file for which code is being generated.
+        file_description (dict): The description of the file for which content is being generated.
         project_description (str): A high-level description of the project's purpose and goals.
         project_files (list): List of all project files for context.
 
     Returns:
-        str: The generated Python code.
+        str: The generated content for the file.
     """
     # Gather context about the project goal and other files
     context = gather_project_context(project_description, project_files)
 
-    # Prepare instructions for OpenAI to generate code based on the file description
+    # Extract the file extension to inform the content type
+    file_extension = os.path.splitext(file_description["path"])[1].lower().strip(".")
+
+    # Dynamically adjust the content type description based on the file extension
+    if file_extension:
+        content_type_description = f"{file_extension.upper()} file content"
+    else:
+        content_type_description = "text content"
+
+    # Prepare instructions for OpenAI to generate content based on the file description and type
     instructions = (
-        "Write the complete Python code for the following file, considering the context of the entire project. "
-        "Use relevant imports and cross-file references where necessary. Do not add extra commentary or explanation."
-        "\nEnsure the code follows PEP8 standards, includes type hints, and contains relevant docstrings."
+        f"Write the complete content for a {content_type_description} that fulfills the following requirements. "
+        "Consider the context of the entire project when generating the content and make use of imports where available and appropriate."
+        "Use relevant imports, references, and appropriate formatting or structure where necessary. Do not add extra commentary or explanation. "
+        "Make sure to return the content directly, without wrapping it in any code fences like triple quotes or backticks."
         f"\n\nFile Description: {file_description['description']}"
         f"\n\n{context}\n"
     )
 
-    # Check if the file has functions to include in the code
+    # Include functions for code files (if provided)
     if file_description.get("functions"):
         instructions += "\n\nFunctions:\n"
         for function in file_description["functions"]:
@@ -315,14 +324,14 @@ def generate_code_for_file(file_description: dict, project_description: str, pro
                 f"(Inputs: {function['inputs']}, Outputs: {function['outputs']})\n"
             )
 
-    # Call the chatgpt function to generate the code
-    generated_code = chatgpt(prompt=instructions)
+    # Call the chatgpt function to generate the content
+    generated_content = chatgpt(prompt=instructions)
 
-    # Strip out any unintended extra explanations that might still slip through
-    if "```python" in generated_code:
-        generated_code = generated_code.split("```python")[1].split("```")[0].strip()
+    # Clean up any unintended code blocks
+    if f"```{file_extension}" in generated_content:
+        generated_content = generated_content.split(f"```{file_extension}")[1].split("```")[0].strip()
 
-    return generated_code
+    return generated_content
 
 
 def generate_readme(description: str, project_structure: dict) -> str:
@@ -341,7 +350,6 @@ def generate_readme(description: str, project_structure: dict) -> str:
     return readme_content
 
 
-# Example usage
 def main():
     if len(sys.argv) > 1 and sys.argv[1] == "--set-api-key":
         update_api_key()
@@ -366,7 +374,7 @@ def main():
 
         # Step 3: Create the project structure (directories and files) on the filesystem
         print(f"\n🐒 ScriptMonkey is coding...")
-        create_project_structure(project_structure)
+        create_project_structure(project_structure_response=project_structure, project_description=project_description)
         print("\nProject structure creation complete.")
 
         # Step 4: Generate the README.md content based on the project description and structure

{scriptmonkey-1.0.1 → scriptmonkey-1.0.3}/scriptmonkey.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scriptmonkey
-Version: 1.0.1
+Version: 1.0.3
 Summary: A Python package that generates complex Python projects and fixes errors in your code using OpenAI's GPT API.
 Home-page: https://github.com/lukerbs/ScriptMonkey
 Author: Luke Kerbs

{scriptmonkey-1.0.1 → scriptmonkey-1.0.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="scriptmonkey",
-    version="1.0.1",
+    version="1.0.3",
     description="A Python package that generates complex Python projects and fixes errors in your code using OpenAI's GPT API.",
     long_description=open("README.md", "r").read(),
     long_description_content_type="text/markdown",