Merge pull request #390 from hearchco/as/fix/ranking-defaults

fix(config): ranking defaults

src/config/defaults_cat_general.go

@@ -28,18 +28,14 @@ var generalRequiredByOriginEngines = []engines.Name{
 	engines.GOOGLE,
 }
 
-var generalPreferredEngines = []engines.Name{
-	engines.ETOOLS, // Not in ByOrigin because it only gives 10 results across a lot of engines that it scrapes from.
-}
+var generalPreferredEngines = []engines.Name{}
 
 var generalPreferredByOriginEngines = []engines.Name{
 	engines.BRAVE,
-	engines.MOJEEK,
-	// engines.YEP,
 }
 
 func generalRanking() CategoryRanking {
-	return EmptyRanking(generalEngines)
+	return ReqPrefOthRanking(generalRequiredEngines, generalPreferredEngines, generalEngines)
 }
 
 var generalTimings = CategoryTimings{

src/config/defaults_cat_images.go

@@ -23,7 +23,7 @@ var imagesPreferredEngines = []engines.Name{}
 var imagesPreferredByOriginEngines = []engines.Name{}
 
 func imagesRanking() CategoryRanking {
-	return EmptyRanking(imagesEngines)
+	return ReqPrefOthRanking(imagesRequiredEngines, imagesPreferredEngines, imagesEngines)
 }
 
 var imagesTimings = CategoryTimings{

src/config/defaults_cat_science.go

@@ -10,18 +10,18 @@ var scienceEngines = []engines.Name{
 	engines.GOOGLESCHOLAR,
 }
 
-var scienceRequiredEngines = []engines.Name{}
-
-var scienceRequiredByOriginEngines = []engines.Name{
+var scienceRequiredEngines = []engines.Name{
 	engines.GOOGLESCHOLAR,
 }
 
+var scienceRequiredByOriginEngines = []engines.Name{}
+
 var sciencePreferredEngines = []engines.Name{}
 
 var sciencePreferredByOriginEngines = []engines.Name{}
 
 func scienceRanking() CategoryRanking {
-	return EmptyRanking(scienceEngines)
+	return ReqPrefOthRanking(scienceRequiredEngines, sciencePreferredEngines, scienceEngines)
 }
 
 var scienceTimings = CategoryTimings{

src/config/defaults_cat_suggestions.go

@@ -23,7 +23,7 @@ var suggestionsPreferredEngines = []engines.Name{}
 var suggestionsPreferredByOriginEngines = []engines.Name{}
 
 func suggestionsRanking() CategoryRanking {
-	return EmptyRanking(suggestionsEngines)
+	return ReqPrefOthRanking(suggestionsRequiredEngines, suggestionsPreferredEngines, suggestionsEngines)
 }
 
 var suggestionsTimings = CategoryTimings{

src/config/defaults_exchange.go

@@ -13,5 +13,5 @@ var exchangeEngines = []engines.Name{
 }
 
 var exchangeTimings = ExchangeTimings{
-	HardTimeout: 500 * time.Millisecond,
+	HardTimeout: 1 * time.Second,
 }

src/config/defaults_ranking.go

@@ -4,8 +4,8 @@ import (
 	"github.com/hearchco/agent/src/search/engines"
 )
 
-func EmptyRanking(engs []engines.Name) CategoryRanking {
-	rnk := CategoryRanking{
+func initCategoryRanking() CategoryRanking {
+	return CategoryRanking{
 		REXP:    0.5,
 		A:       1,
 		B:       0,
@@ -17,6 +17,10 @@ func EmptyRanking(engs []engines.Name) CategoryRanking {
 		TRD:     0,
 		Engines: map[string]CategoryEngineRanking{},
 	}
+}
+
+func EmptyRanking(engs []engines.Name) CategoryRanking {
+	rnk := initCategoryRanking()
 
 	for _, eng := range engs {
 		rnk.Engines[eng.String()] = CategoryEngineRanking{
@@ -27,3 +31,33 @@ func EmptyRanking(engs []engines.Name) CategoryRanking {
 
 	return rnk
 }
+
+func ReqPrefOthRanking(req []engines.Name, pref []engines.Name, oth []engines.Name) CategoryRanking {
+	rnk := initCategoryRanking()
+
+	// First set the least important engines
+	for _, eng := range oth {
+		rnk.Engines[eng.String()] = CategoryEngineRanking{
+			Mul:   1,
+			Const: 0,
+		}
+	}
+
+	// Afterwards overwrite with the preferred engines
+	for _, eng := range pref {
+		rnk.Engines[eng.String()] = CategoryEngineRanking{
+			Mul:   1.25,
+			Const: 0,
+		}
+	}
+
+	// Finally overwrite with the required engines
+	for _, eng := range req {
+		rnk.Engines[eng.String()] = CategoryEngineRanking{
+			Mul:   1.5,
+			Const: 0,
+		}
+	}
+
+	return rnk
+}