Merge pull request #3 from Lore09/pelato

Pelato

.env.template

@@ -1,4 +1,6 @@
 REGISTRY_URL=
 REGISTRY_USER=
 REGISTRY_PASSWORD=
-PARALLEL_BUILD=
+PARALLEL_BUILD=
+NATS_HOST=
+NATS_PORT=

infra/wasmcloud/wasmcloud-edge-host/README.md

@@ -16,7 +16,7 @@ nast server check connection
 
 Creare l'host wasmcloud con il comando
 ```bash
-wash up -d
+wash up -d --multi-local
 ```
 Controllare il corretto deployment dell'host
 ```bash

pelato.py

@@ -1,7 +1,11 @@
 import argparse
 import src
+from dotenv import load_dotenv
+
 
 def main():
+    load_dotenv()
+    
     parser = argparse.ArgumentParser(
         description="Generate, build and deploy WASM components written in go"
     )

project/tasks/danano.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+
+)
+
+func exec_task(arg string) string{
+
+	response :=  "" + arg
+
+	return response
+}

project/tasks/task1.go

@@ -6,7 +6,7 @@ import (
 
 func exec_task(arg string) string{
 
-	response := "" + arg
+	response := "Ciao danano "  + arg
 
 	return response
 }

project/workflow.yaml

@@ -1,11 +1,21 @@
+project_name: Test
 tasks:
-  - name: Data Aggregation                # Displayed name
+  - name: Data Aggregation
-    type: processor_nats                      # Used to select template
+    type: producer_nats
-    code: task1.go                    # Go code file inside tasks/ dir
+    code: task1.go
-    target:                               # Where the component will be deployed
+    targets:
       - edge
       - cloud
-    source_topic: temp_sensor             # Source NATS topic
+    source_topic: temp_sensor
-    dest_topic: aggregated_data           # Destination NATS topic
+    dest_topic: aggregated_data
-    component_name: data_aggregation      # Component name displayed in the OCI artifact
+    component_name: data_aggregation
+    version: 1.0.0
+  - name: Aiutatemi
+    type: processor_nats
+    code: danano.go
+    targets:
+      - edge
+    source_topic: test
+    dest_topic: temp_sensor
+    component_name: test_producer
     version: 1.0.0

src/__init__.py

@@ -1,8 +1,7 @@
-from dotenv import load_dotenv
 import os
-
 import src.code_generator.generator as code_generator
 import src.wasm_builder.build as wasm_builder
+import src.component_deploy.deploy as deployer
 
 class Pelato:
     def __init__(self):
@@ -10,12 +9,13 @@ class Pelato:
         self.setup_vars()
         
     def setup_vars(self):
-        load_dotenv()
         
         self.registry_url = os.getenv('REGISTRY_URL')
         self.reg_user = os.getenv('REGISTRY_USER')
         self.reg_pass = os.getenv('REGISTRY_PASSWORD')
         self.detached = os.getenv('PARALLEL_BUILD')
+        self.nats_host = os.getenv('NATS_HOST')
+        self.nats_port = os.getenv('NATS_PORT')
         
     def generate(self, project_dir):
         code_generator.generate(project_dir, self.registry_url)
@@ -24,7 +24,14 @@ class Pelato:
         wasm_builder.build_project(project_dir, self.reg_user, self.reg_pass, self.detached)
         
     def deploy(self, project_dir):
-        print(f"Deploying WASM components for project {project_dir}")
+        deployer.deploy_components(project_dir, self.nats_host, self.nats_port, self.detached)
-        
+
     def all(self, project_dir):
-        print(f"Doing everything for project {project_dir}")
+        
+        print('-------------------------------------------')
+        print(f"Starting PELATO for project {project_dir}")
+        print('-------------------------------------------')
+        
+        self.generate(project_dir)
+        self.build(project_dir)
+        self.deploy(project_dir)

src/code_generator/templates/processor_nats/wadm.yaml

@@ -7,7 +7,7 @@ spec:
     - name: {{ component_name }}
       type: component
       properties:
-        image: "{{ registry_url }}/{{ component_name }}:{{ version }}"
+        image: {{ registry_url }}/{{ component_name }}:{{ version }}
         id: stream
       traits:
         - type: link

src/code_generator/templates/producer_nats/wadm.yaml

@@ -7,7 +7,7 @@ spec:
     - name: {{ component_name }}
       type: component
       properties:
-        image: "{{ registry_url }}/{{ component_name }}:{{ version }}"
+        image: {{ registry_url }}/{{ component_name }}:{{ version }}
         id: producer
       traits:
         - type: spreadscaler

src/component_deploy/deploy.py

@@ -0,0 +1,83 @@
+import docker
+import os
+import logging
+import yaml
+
+def deploy_components(project_dir, nats_host, nats_port, detached):
+
+    # Check if the project directory is valid
+    if not os.path.exists(f"{project_dir}/gen"):
+        logging.error(f"Project directory is not valid")
+        return
+    
+    print('Deploying WASM components')
+    
+    # Docker client
+    client = docker.from_env()
+    
+    # Build the images for the project if they don't exist
+    try:
+        client.images.get("wash-deploy-image:latest")
+    except docker.errors.ImageNotFound:
+        
+        print(' - Building wash-deploy-image from Dockerfile...')
+        client.images.build(
+            path="src/component_deploy/docker",
+            dockerfile="deploy.Dockerfile",
+            tag="wash-deploy-image:latest"
+        )
+        
+    try:
+        wait_list = []
+        
+        for task in os.listdir(f"{project_dir}/gen"):
+            __deploy_wadm(f"{project_dir}/gen/{task}", client, nats_host, nats_port, detached, wait_list)
+            
+        if detached == 'True':
+            
+            print('Waiting for deployment...')
+            for container in wait_list:
+                try:
+                    client.containers.get(container).wait()
+                except Exception:
+                    continue
+        
+    except Exception as e:
+        logging.error(f"Error deploying project: {e}")
+        return
+    
+    print("Project built successfully")
+    
+def __deploy_wadm(task_dir, client, nats_host, nats_port, detached, wait_list):
+    
+    wadm = __parse_yaml(f"{task_dir}/wadm.yaml")
+    
+    path = os.path.abspath(task_dir)
+    
+    name = wadm['spec']['components'][0]['name'] + '-deploy'
+    
+    # Build the wasm module
+    print(f" - Deploying WASM module {name}")
+    container = client.containers.run(
+        "wash-deploy-image:latest",
+        environment=[f'WASMCLOUD_CTL_HOST={nats_host}',
+                     f'WASMCLOUD_CTL_PORT={nats_port}'],
+        volumes={path: {'bind': '/app', 'mode': 'rw'}},
+        remove=True,
+        detach=True,
+        name=name
+    )
+    
+    if detached == 'False':
+        container.wait()
+    else:
+        wait_list.append(name)
+    
+
+def __parse_yaml(yaml_file):
+    with open(yaml_file, 'r') as stream:
+        try:
+            return yaml.safe_load(stream)
+        except yaml.YAMLError as exc:
+            print(exc)
+            return None

src/wasm_builder/build.py

@@ -10,6 +10,8 @@ def build_project(project_dir, reg_user, reg_pass, detached):
         logging.error(f"Project directory is not valid")
         return
     
+    print('Building WASM components')
+    
     # Docker client
     client = docker.from_env()
     
@@ -17,6 +19,8 @@ def build_project(project_dir, reg_user, reg_pass, detached):
     try:
         client.images.get("wash-build-image:latest")
     except docker.errors.ImageNotFound:
+        
+        print(' - Building wash-build-image from Dockerfile...')
         client.images.build(
             path="src/wasm_builder/docker",
             dockerfile="build.Dockerfile",
@@ -24,21 +28,34 @@ def build_project(project_dir, reg_user, reg_pass, detached):
         )
         
     try:
+        wait_list = []
+        
         for task in os.listdir(f"{project_dir}/gen"):
-            __build_wasm(f"{project_dir}/gen/{task}", client, reg_user, reg_pass, detached)
+            __build_wasm(f"{project_dir}/gen/{task}", client, reg_user, reg_pass, detached, wait_list)
+            
+        if detached == 'True':
+            
+            print('Waiting for build to finish...')
+            for container in wait_list:
+                try:
+                    client.containers.get(container).wait()
+                except Exception:
+                    continue
+        
     except Exception as e:
         logging.error(f"Error building project: {e}")
         return
     
     print("Project built successfully")
     
-def __build_wasm(task_dir, client, reg_user, reg_pass, detached):
+def __build_wasm(task_dir, client, reg_user, reg_pass, detached, wait_list):
     
     wadm = __parse_yaml(f"{task_dir}/wadm.yaml")
     
     path = os.path.abspath(task_dir)
     
     oci_url = wadm['spec']['components'][0]['properties']['image']
+    name = wadm['spec']['components'][0]['name'] + '-build'
     
     # Build the wasm module
     print(f" - Building WASM module {oci_url}")
@@ -49,11 +66,14 @@ def __build_wasm(task_dir, client, reg_user, reg_pass, detached):
                      f'WASH_REG_PASSWORD={reg_pass}'],
         volumes={path: {'bind': '/app', 'mode': 'rw'}},
         remove=True,
-        detach=True
+        detach=True,
+        name=name
     )
     
     if detached == 'False':
         container.wait()
+    else:
+        wait_list.append(name)
     
 
 def __parse_yaml(yaml_file):