Merge branch 'main' of https://cloud.o-forge.io/core/oc-lib into main

merge oclib

models/booking/booking.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"cloud.o-forge.io/core/oc-lib/dbs"
-	"cloud.o-forge.io/core/oc-lib/logs"
 	"cloud.o-forge.io/core/oc-lib/models/common/enum"
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 	"cloud.o-forge.io/core/oc-lib/tools"
@@ -40,8 +39,6 @@ func (wfa *Booking) Check(id string, start time.Time, end *time.Time, parrallelA
 		end = &e
 	}
 	accessor := NewAccessor(nil)
-	l := logs.GetLogger().With().Str("Search Check", "Booking").Logger()
-	l.Debug().Msg("Starting to search")
 	res, code, err := accessor.Search(&dbs.Filters{
 		And: map[string][]dbs.Filter{ // check if there is a booking on the same compute resource by filtering on the compute_resource_id, the state and the execution date
 			"resource_id": {{Operator: dbs.EQUAL.String(), Value: id}},
@@ -52,9 +49,6 @@ func (wfa *Booking) Check(id string, start time.Time, end *time.Time, parrallelA
 			},
 		},
 	}, "", wfa.IsDraft)
-
-	l.Debug().Msg("Search finished")
-
 	if code != 200 {
 		return false, err
 	}

models/peer/peer_cache.go

@@ -29,28 +29,7 @@ type PeerCache struct {
 
 // urlFormat formats the URL of the peer with the data type API function
 func (p *PeerCache) urlFormat(hostUrl string, dt tools.DataType) string {
-	// localhost is replaced by the local peer URL
-	// because localhost must collide on a web request security protocol
-	/*localhost := ""
-	if strings.Contains(hostUrl, "localhost") {
-		localhost = "localhost"
-	}
-	if strings.Contains(hostUrl, "127.0.0.1") {
-		localhost = "127.0.0.1"
-	}
-	if localhost != "" {
-		r := regexp.MustCompile("(" + localhost + ":[0-9]+)")
-		t := r.FindString(hostUrl)
-		if t != "" {
-			hostUrl = strings.Replace(hostUrl, t, dt.API()+":8080/oc", -1)
-		} else {
-			hostUrl = strings.ReplaceAll(hostUrl, localhost, dt.API()+":8080/oc")
-		}
-	} else {*/
-	hostUrl = hostUrl + "/" + strings.ReplaceAll(dt.API(), "oc-", "")
-	//}
-	fmt.Println("Contacting", hostUrl)
-	return hostUrl
+	return hostUrl + "/" + strings.ReplaceAll(dt.API(), "oc-", "")
 }
 
 // checkPeerStatus checks the status of a peer

models/workflow/workflow.go

@@ -31,6 +31,43 @@ func (d *Workflow) GetAccessor(request *tools.APIRequest) utils.Accessor {
 	return NewAccessor(request) // Create a new instance of the accessor
 }
 
+type Deps struct {
+	Source string
+	Dest   string
+}
+
+func (w *Workflow) isDependancy(id string) []Deps {
+	dependancyOfIDs := []Deps{}
+	for _, link := range w.Graph.Links {
+		if _, ok := w.Graph.Items[link.Destination.ID]; !ok {
+			continue
+		}
+		source := w.Graph.Items[link.Destination.ID].Processing
+		if id == link.Source.ID && source != nil {
+			dependancyOfIDs = append(dependancyOfIDs, Deps{Source: source.GetName(), Dest: link.Destination.ID})
+		}
+		sourceWF := w.Graph.Items[link.Destination.ID].Workflow
+		if id == link.Source.ID && sourceWF != nil {
+			dependancyOfIDs = append(dependancyOfIDs, Deps{Source: sourceWF.GetName(), Dest: link.Destination.ID})
+		}
+	}
+	return dependancyOfIDs
+}
+
+func (w *Workflow) GetDependencies(id string) (dependencies []Deps) {
+	for _, link := range w.Graph.Links {
+		if _, ok := w.Graph.Items[link.Source.ID]; !ok {
+			continue
+		}
+		source := w.Graph.Items[link.Source.ID].Processing
+		if id == link.Destination.ID && source != nil {
+			dependencies = append(dependencies, Deps{Source: source.GetName(), Dest: link.Source.ID})
+			continue
+		}
+	}
+	return
+}
+
 func (w *Workflow) GetGraphItems(f func(item graph.GraphItem) bool) (list_datas []graph.GraphItem) {
 	for _, item := range w.Graph.Items {
 		if f(item) {

tools/api.go

@@ -9,7 +9,6 @@ import (
 	"cloud.o-forge.io/core/oc-lib/dbs/mongo"
 	"cloud.o-forge.io/core/oc-lib/logs"
 	beego "github.com/beego/beego/v2/server/web"
-	"github.com/google/uuid"
 )
 
 type APIRequest struct {
@@ -136,10 +135,8 @@ func (a *API) CheckRemotePeer(url string) (State, map[string]int) {
 
 // CheckRemoteAPIs checks the state of remote APIs from your proper OC
 func (a *API) CheckRemoteAPIs(apis []DataType) (State, map[string]string, error) {
-	id := uuid.New()
-	l := logs.GetLogger().With().Str("id",id.String()).Logger()
-	l.Debug().Msg("Start checking")
 	// Check if the database is up
+	l := logs.GetLogger()
 	new := map[string]string{}
 	caller := NewHTTPCaller(map[DataType]map[METHOD]string{}) // Create a new http caller
 	code := 0
@@ -147,10 +144,10 @@ func (a *API) CheckRemoteAPIs(apis []DataType) (State, map[string]string, error)
 	state := ALIVE
 	reachable := false
 	for _, api := range apis { // Check the state of each remote API in the list
-		l.Debug().Msg("Checking : " + api.String() + " at " + api.API())
 		var resp APIStatusResponse
 		b, err := caller.CallGet("http://"+api.API()+":8080", "/oc/version/status") // Call the status endpoint of the remote API (standard OC status endpoint)
 		if err != nil {
+			l.Error().Msg(api.String() + " not reachable")
 			state = REDUCED_SERVICE // If a remote API is not reachable, return reduced service
 			continue
 		}
@@ -167,6 +164,7 @@ func (a *API) CheckRemoteAPIs(apis []DataType) (State, map[string]string, error)
 		reachable = true // If the remote API is reachable, set reachable to true cause we are not dead
 	}
 	if !reachable {
+		l.Error().Msg("Peer check returned no answers")
 		state = DEAD // If no remote API is reachable, return dead, nobody is alive
 	}
 	if code > 0 {