fix(compose): totally restructre docker compose generator

Author: abolfazl8131

app/directory_generators/compose_generator.py

@@ -1,39 +0,0 @@
-import os
-
-project_name = "app/media/MyCompose"
-compose_file_path = os.path.join(project_name, "docker-compose.yaml")
-
-# Create project directories
-os.makedirs(project_name, exist_ok=True)
-
-# Create docker-compose.yaml
-with open(compose_file_path, "w") as compose_file:
-    compose_file.write("version: '3'\n")
-    compose_file.write("services:\n")
-    compose_file.write("  web_server:\n")
-    compose_file.write("    image: nginx:latest\n")
-    compose_file.write("    volumes:\n")
-    compose_file.write("      - ./nginx/nginx.conf:/etc/nginx/nginx.conf\n")
-    compose_file.write("    depends_on:\n")
-    compose_file.write("      - string\n")
-    compose_file.write("    ports:\n")
-    compose_file.write("      - '80:80'\n")
-    compose_file.write("    environment:\n")
-    compose_file.write("      - foo=bar\n")
-    compose_file.write("    networks:\n")
-    compose_file.write("      - app_network\n")
-    compose_file.write("  monitoring_server:\n")
-    compose_file.write("    image: grafana:latest\n")
-    compose_file.write("    volumes:\n")
-    compose_file.write("      - ./nginx/nginx.conf:/etc/nginx/nginx.conf\n")
-    compose_file.write("    depends_on:\n")
-    compose_file.write("      - string\n")
-    compose_file.write("    ports:\n")
-    compose_file.write("      - '82:80'\n")
-    compose_file.write("    environment:\n")
-    compose_file.write("      - foo=bar\n")
-    compose_file.write("    networks:\n")
-    compose_file.write("      - app_network\n")
-    compose_file.write("networks:\n")
-    compose_file.write("  app_network:\n")
-    compose_file.write("    driver: bridge\n")

app/media/MyCompose/docker-compose.yaml

@@ -1,31 +1,78 @@
-version: '3'
+networks:
+  additionalProp1:
+    driver: string
+  additionalProp2:
+    driver: string
+  additionalProp3:
+    driver: string
 services:
-  web_server:
-    image: nginx:latest
-    volumes:
-      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+  additionalProp1:
+    args:
+      additionalProp1: string
+      additionalProp2: string
+      additionalProp3: string
+    build:
+      context: string
+      dockerfile: string
+    command: string
+    container_name: string
     depends_on:
-      - string
-    ports:
-      - '80:80'
+    - string
     environment:
-      - foo=bar
+      additionalProp1: string
+      additionalProp2: string
+      additionalProp3: string
+    image: string
     networks:
-      - app_network
-
-  monitoring_server:
-    image: grafana:latest
+    - string
+    ports:
+    - string
     volumes:
-      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+    - string
+  additionalProp2:
+    args:
+      additionalProp1: string
+      additionalProp2: string
+      additionalProp3: string
+    build:
+      context: string
+      dockerfile: string
+    command: string
+    container_name: string
     depends_on:
-      - string
+    - string
+    environment:
+      additionalProp1: string
+      additionalProp2: string
+      additionalProp3: string
+    image: string
+    networks:
+    - string
     ports:
-      - '82:80'
+    - string
+    volumes:
+    - string
+  additionalProp3:
+    args:
+      additionalProp1: string
+      additionalProp2: string
+      additionalProp3: string
+    build:
+      context: string
+      dockerfile: string
+    command: string
+    container_name: string
+    depends_on:
+    - string
     environment:
-      - foo=bar
+      additionalProp1: string
+      additionalProp2: string
+      additionalProp3: string
+    image: string
     networks:
-      - app_network
-      
-networks:
-  app_network:
-    driver: bridge
+    - string
+    ports:
+    - string
+    volumes:
+    - string
+version: string

app/models/ansible_models.py

@@ -32,7 +32,7 @@ def validator_os(cls, value):
         return value
 
 
-    
+   
 class AnsibleInstallKuber(AnsibleBase):
     os: str = 'ubuntu'
     k8s_worker_nodes: List[str]

app/models/compose_models.py

@@ -1,59 +1,27 @@
-from typing import List, Optional
-from pydantic import BaseModel, validator, ValidationError, computed_field
-
-class Port(BaseModel):
-    machine_port:int = 80
-    container_port:int = 80
-    
-class Network(BaseModel):
-    name:str = 'app_network'
-
-class EnvironmentVariable(BaseModel):
-    name:str = 'foo'
-    value:str = "bar"
-    
-    @computed_field
-    @property
-    def env_full(self) -> int:
-        return f"{self.name}:{self.value}"
-    
-class Volume(BaseModel):
-    local_dir: str = './nginx/nginx.conf'
-    container_dir:str = '/etc/nginx/nginx.conf'
-    
-    @computed_field
-    @property
-    def volume(self) -> int:
-        return f"{self.local_dir}:{self.container_dir}"
+from typing import Dict, List, Optional
+from pydantic import BaseModel
 
 class Build(BaseModel):
-    context:str
-    dockerfile:str
+    context: str
+    dockerfile: str
+
 class Service(BaseModel):
-    image:str = 'nginx'
-    name:str = 'web_server'
-    container_name:str = 'web_server'
-    build: Build | None = None
-    version:str = 'latest'
-    volumes:List[Volume] | None = None
-    depends_on:List[str] | None = None
-    ports:List[Port]
-    networks:List[Network] | None = None
-    environments:List[EnvironmentVariable] | None = None
-    
-    @computed_field
-    @property
-    def image_full(self) -> int:
-        return f"{self.image}:{self.version}"
-    
-    @computed_field
-    @property
-    def volumes_full(self) -> int:
-        return [i.volume for i in self.volumes]
-    
-    
-      
+    build: Optional[Build] = None
+    image: Optional[str] = None
+    container_name: Optional[str] = None
+    command: Optional[str] = None
+    volumes: Optional[List[str]] = None
+    environment: Optional[Dict[str, str]] = None
+    ports: Optional[List[str]] = None
+    networks: Optional[List[str]] = None
+    args: Optional[Dict[str, str]] = None
+    depends_on: Optional[List[str]] = None
+
+class Network(BaseModel):
+    driver: str
+
 class DockerCompose(BaseModel):
-    services: List[Service]
-    network:Network
-    
+    version: str
+    services: Dict[str, Service]
+    networks: Optional[Dict[str, Network]] = None
+

app/routes/docker.py

@@ -10,10 +10,7 @@ async def docker_compose_template(request:DockerCompose) -> Output:
 
         if os.environ.get("TEST"):
             return Output(output='output')
-        generated_prompt = docker_compose_generator(request)
+        docker_compose_generator(request)
 
-        output = gpt_service(generated_prompt)
-        edit_directory_generator("compose_generator",output)
-        execute_pythonfile("MyCompose","compose_generator")
         return Output(output='output')
 

app/template_generators/docker/compose.py

@@ -1,59 +1,11 @@
-def docker_compose_generator(input):
-    compose_network = input.network.name
-    compose_services = input.services
-    services = [i.name for i in compose_services]
-    images = [{i.name:i.image_full} for i in compose_services]
-    volumes = [{i.name:i.volumes_full} for i in compose_services]
-    depends_on = [{i.name:i.depends_on} for i in compose_services]
-    ports = [{i.name:i.ports} for i in compose_services]
-    env = [{i.name:i.environments} for i in compose_services]
-    networks = [{i.name:i.networks} for i in compose_services]
-   
-    
-    prompt = f"""
-
-        generate a python code (with out any ```python entry or additionals) with generates a docker-compose.yaml file in the directory 'app/media/MyCompose'
-        
-        the docker-compose.yaml, must following there instructions:
-                    the version must be = 3
-                    set services following this list: {services}
-                    set images to serivce following this dict : {images}
-                    set volumes to service following this dict : {volumes}
-                    set depends_on to service following this dict : {depends_on}
-                    set ports to service following this dict : {ports}
-                    set environment to service following this dict : {env}
-                    set netwotks to service following this dict : {networks}
-                    
-                    
-                    finally, at the end of docker-compose file, add following block:
-                    ```
-                        networks:
-                            {compose_network}:
-                                driver: bridge
-                    
-                    ```
-            
-        
-        finally just give me a python code without any note that can generate a project folder with the
-                    given schema without ```python entry. and we dont need any base directory in the python code.
-                    the final ansible template must work very well without any error!
-                    
-                    
-                    the python code you give me, must have structure like that:
-                    
-                    import os
-                    project_name = "app/media/MyCompose"
-                    foo_dir = os.path.join(project_name, "bar")
-                    x_dir = os.path.join(modules_dir, "y")
+import yaml
+from app.models.compose_models import DockerCompose
 
-                    # Create project directories
-                    os.makedirs(compose_dir, exist_ok=True)
-
-                    # Create main.tf
-                    with open(os.path.join(project_name, "main.tf"), "w") as main_file:
-                        # any thing you need
-    
+def docker_compose_generator(input):
 
+    compose_total = input.model_dump(mode="json")
 
-    """
-    return prompt
+    file=open("app/media/MyCompose/docker-compose.yaml","w")
+    yaml.dump(compose_total,file)
+    file.close()
+