chore!: rename algo to function #139

ThibaultFy · 2023-01-31T09:03:25Z

Description

Rename Algo concept to Function on all the stack.

Companion PRs

guilhem-barthes · 2023-02-01T10:41:39Z

server/standalone/migration/000055_rename-algo-to-function.up.sql

+WHERE kind = 'ASSET_ALGO';
+
+UPDATE events
+SET asset = asset - 'algo' || JSONB_BUILD_OBJECT('function', asset->'algo')


Make sure what was the field name before, the test failing seems to indicate that it was algorithm and not algo

It is on the migration 000029, it seems to be algo:/

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

guilhem-barthes · 2023-02-10T11:02:56Z

docs/schemas/entities.mmd

-    ComputeTask }o--|| Algo : execute
-    Algo {}
+    ComputeTask }o--|| Function : execute
+    Function {}


Do we still need this line?

guilhem-barthes · 2023-02-10T11:04:47Z

e2e/client/client.go

@@ -78,7 +78,7 @@ type TestClient struct {
 	ks                   *KeyStore
 	logger               zerolog.Logger
 	organizationService  asset.OrganizationServiceClient
-	algoService          asset.AlgoServiceClient
+	functionService          asset.FunctionServiceClient


Can you please align the right column with the other ones?

Suggested change

functionService asset.FunctionServiceClient

functionService asset.FunctionServiceClient

guilhem-barthes · 2023-02-10T11:05:15Z

e2e/client/client.go

@@ -128,7 +128,7 @@ func (f *TestClientFactory) NewTestClient() *TestClient {
 		ks:                   NewKeyStore(),
 		logger:               logger,
 		organizationService:  asset.NewOrganizationServiceClient(f.conn),
-		algoService:          asset.NewAlgoServiceClient(f.conn),
+		functionService:          asset.NewFunctionServiceClient(f.conn),


Same alignment here

Suggested change

functionService: asset.NewFunctionServiceClient(f.conn),

functionService: asset.NewFunctionServiceClient(f.conn),

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

guilhem-barthes

Thanks for this great job! I would just like to have go fmt on the full codebase (https://go.dev/blog/gofmt) and a small change on the migration

guilhem-barthes · 2023-02-10T11:06:00Z

e2e/client/option.go

@@ -35,7 +35,7 @@ type TaskInputOptions struct {

 type TrainTaskOptions struct {
 	KeyRef         string
-	AlgoRef        string
+	FunctionRef        string


Suggested change

FunctionRef string

FunctionRef string

guilhem-barthes · 2023-02-10T11:06:12Z

e2e/client/option.go

@@ -45,7 +45,7 @@ type TrainTaskOptions struct {

 type TestTaskOptions struct {
 	KeyRef         string
-	AlgoRef        string
+	FunctionRef        string


Suggested change

FunctionRef string

FunctionRef string

guilhem-barthes · 2023-02-10T11:06:24Z

e2e/client/option.go

@@ -55,7 +55,7 @@ type TestTaskOptions struct {

 type PredictTaskOptions struct {
 	KeyRef         string
-	AlgoRef        string
+	FunctionRef        string


Suggested change

FunctionRef string

FunctionRef string

guilhem-barthes · 2023-02-10T11:06:32Z

e2e/client/option.go

@@ -65,7 +65,7 @@ type PredictTaskOptions struct {

 type CompositeTaskOptions struct {
 	KeyRef         string
-	AlgoRef        string
+	FunctionRef        string


Suggested change

FunctionRef string

FunctionRef string

guilhem-barthes · 2023-02-10T11:07:20Z

e2e/client/option.go

 	KeyRef  string
-	AlgoRef string
+	FunctionRef string
 	PlanRef string
 	Worker  string
 	Inputs  []*TaskInputOptions


In this case, align all the string to the furthest on the right

guilhem-barthes · 2023-02-10T11:07:50Z

e2e/client/option.go

@@ -152,7 +152,7 @@ func (o *TestTaskOptions) GetNewTask(ks *KeyStore) *asset.NewComputeTask {
 func DefaultTrainTaskOptions() *TrainTaskOptions {
 	return &TrainTaskOptions{
 		KeyRef:         DefaultTrainTaskRef,
-		AlgoRef:        DefaultSimpleAlgoRef,
+		FunctionRef:        DefaultSimpleFunctionRef,


Suggested change

FunctionRef: DefaultSimpleFunctionRef,

FunctionRef: DefaultSimpleFunctionRef,

guilhem-barthes · 2023-02-10T11:08:00Z

e2e/client/option.go

@@ -204,7 +204,7 @@ func (o *TrainTaskOptions) SetOutputs(outputs map[string]*asset.NewComputeTaskOu
 func (o *TrainTaskOptions) GetNewTask(ks *KeyStore) *asset.NewComputeTask {
 	return &asset.NewComputeTask{
 		Key:            ks.GetKey(o.KeyRef),
-		AlgoKey:        ks.GetKey(o.AlgoRef),
+		FunctionKey:        ks.GetKey(o.FunctionRef),


Suggested change

FunctionKey: ks.GetKey(o.FunctionRef),

FunctionKey: ks.GetKey(o.FunctionRef),

guilhem-barthes · 2023-02-10T11:08:10Z

e2e/client/option.go

@@ -214,7 +214,7 @@ func (o *TrainTaskOptions) GetNewTask(ks *KeyStore) *asset.NewComputeTask {
 func DefaultPredictTaskOptions() *PredictTaskOptions {
 	return &PredictTaskOptions{
 		KeyRef:         DefaultPredictTaskRef,
-		AlgoRef:        DefaultPredictAlgoRef,
+		FunctionRef:        DefaultPredictFunctionRef,


Suggested change

FunctionRef: DefaultPredictFunctionRef,

FunctionRef: DefaultPredictFunctionRef,

guilhem-barthes · 2023-02-10T11:08:19Z

e2e/client/option.go

@@ -252,7 +252,7 @@ func (o *PredictTaskOptions) WithDataSampleRef(ref string) *PredictTaskOptions {
 func (o *PredictTaskOptions) GetNewTask(ks *KeyStore) *asset.NewComputeTask {
 	return &asset.NewComputeTask{
 		Key:            ks.GetKey(o.KeyRef),
-		AlgoKey:        ks.GetKey(o.AlgoRef),
+		FunctionKey:        ks.GetKey(o.FunctionRef),


Suggested change

FunctionKey: ks.GetKey(o.FunctionRef),

FunctionKey: ks.GetKey(o.FunctionRef),

guilhem-barthes · 2023-02-10T11:14:25Z

server/standalone/migration/000055_rename-algo-to-function.up.sql

+ALTER TABLE algos
+RENAME CONSTRAINT algos_owner_channel_fkey TO functions_owner_channel_fkey;
+
+ALTER TABLE algos
+RENAME COLUMN algorithm TO functionAddress;
+
+ALTER TABLE algos
+RENAME TO functions;
+
+ALTER TABLE compute_tasks
+RENAME COLUMN algo_key TO function_key;
+
+ALTER TABLE algo_outputs
+RENAME COLUMN algo_key TO function_key;
+
+ALTER TABLE algo_outputs
+RENAME TO function_outputs;
+
+ALTER TABLE algo_inputs
+RENAME COLUMN algo_key TO function_key;
+
+ALTER TABLE algo_inputs
+RENAME TO function_inputs;
+
+ALTER TABLE performances
+RENAME COLUMN algo_key TO function_key;
+
+ALTER TABLE performances
+RENAME CONSTRAINT performances_algo_key_fkey TO performances_function_key_fkey;
+
+DROP VIEW IF EXISTS expanded_algos;
+CREATE VIEW expanded_functions AS
+SELECT 	key,
+        name,
+        description             AS description_address,
+        desc_add.checksum       AS description_checksum,
+        functionAddress          AS function_address,
+        function_add.checksum   AS function_checksum,
+	    permissions,
+        owner,
+        creation_date,
+        metadata,
+        channel
+FROM functions
+JOIN addressables desc_add ON functions.description = desc_add.storage_address
+JOIN addressables function_add ON functions.functionAddress = function_add.storage_address;
+
+INSERT INTO asset_kinds(kind)
+VALUES ('ASSET_FUNCTION');
+
+UPDATE events e
+SET asset_kind = 'ASSET_FUNCTION'
+WHERE e.asset_kind = 'ASSET_ALGO';
+
+DELETE FROM asset_kinds
+WHERE kind = 'ASSET_ALGO';
+
+UPDATE events
+SET asset = jsonb_set(asset, '{functionKey}', asset->'algoKey') - 'algoKey'
+WHERE asset_kind = 'ASSET_COMPUTE_TASK' AND NOT(asset ? 'functionKey');
+
+UPDATE events
+SET asset = JSONB_SET(asset, '{function}',
+                      asset -> 'algorithm') - 'algorithm'
+WHERE asset_kind = 'ASSET_FUNCTION';


Can you please add a condition around this full migration to avoid to rerun it from a dirty state?

Ah yes I wanted to do that... How do we choose the right condition ?

Mh ... That's a tricky one, we don't have guideliens on it but as everything should be executed in the same transaction, any of the changes can be used, for instance table_exists('public', 'functions')

Do you mean table_exists('public', 'algos') ?

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

guilhem-barthes · 2023-02-10T12:29:01Z

server/standalone/migration/000055_rename-algo-to-function.up.sql

+RENAME CONSTRAINT algos_owner_channel_fkey TO functions_owner_channel_fkey;
+
+ALTER TABLE algos
+RENAME COLUMN algorithm TO functionAddress;


Shouldn't it be function_address?

I remember having an error using "_" in the name

guilhem-barthes · 2023-02-10T12:30:18Z

server/standalone/migration/000055_rename-algo-to-function.up.sql

+        name,
+        description             AS description_address,
+        desc_add.checksum       AS description_checksum,
+        functionAddress          AS function_address,


shouldn't it be function_address ? (also, can you remove one space to align the one on the right .__)

guilhem-barthes · 2023-02-10T12:30:58Z

server/standalone/migration/000055_rename-algo-to-function.up.sql

+        desc_add.checksum       AS description_checksum,
+        functionAddress          AS function_address,
+        function_add.checksum   AS function_checksum,
+	    permissions,


Suggested change

permissions,

permissions,

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

guilhem-barthes

LGTM, thanks for the work 🙏

ThibaultFy changed the title ~~rename algo to function~~ chore: rename algo to function Jan 31, 2023

guilhem-barthes reviewed Feb 1, 2023

View reviewed changes

ThibaultFy changed the title ~~chore: rename algo to function~~ chore!: rename algo to function Feb 1, 2023

ThibaultFy force-pushed the rename-algo-to-function branch from f7eeee1 to 9f11939 Compare February 6, 2023 15:45

ThibaultFy added 20 commits February 7, 2023 17:41

rename algo to function

918fbc8

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

rename algo to function

56e9763

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

rename algo to function

fbf8ed4

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

go lint

f397179

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

algo to function

4ceec70

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

4c06842

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

ab653c1

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

a8e17a0

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

6b8b16d

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

cfbd219

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

acfe95b

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

6d98434

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

ba7f0e4

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

e5818e6

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

3d43b8b

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

b0f1c3f

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

eea5c07

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

c82f82f

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

4a6276f

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migrations

0dbd4b8

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

ThibaultFy added 9 commits February 7, 2023 17:41

migration

7cb4be5

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

migration

e408a78

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

rename algo to function

25cdff5

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

rename algo to function

66376e9

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

rename algo to function

9a38d09

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

rename algo to function

62904df

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

rename algo to function

138b71e

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

fix

9d6f08f

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

rename doc

2f2d365

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

ThibaultFy force-pushed the rename-algo-to-function branch from ceb395f to 2f2d365 Compare February 7, 2023 16:41

ThibaultFy marked this pull request as ready for review February 9, 2023 10:22

ThibaultFy requested a review from a team as a code owner February 9, 2023 10:22

ThibaultFy requested review from oleobal, Milouu and guilhem-barthes February 9, 2023 10:22

changelog

5496ab1

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

guilhem-barthes reviewed Feb 10, 2023

View reviewed changes

alignement

3f88b96

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

guilhem-barthes requested changes Feb 10, 2023

View reviewed changes

go fmt

e40f521

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

guilhem-barthes reviewed Feb 10, 2023

View reviewed changes

conditions on migrations

b589903

Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>

ThibaultFy requested a review from guilhem-barthes February 10, 2023 14:05

guilhem-barthes approved these changes Feb 10, 2023

View reviewed changes

ThibaultFy merged commit 3151513 into main Feb 10, 2023

ThibaultFy deleted the rename-algo-to-function branch February 10, 2023 16:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore!: rename algo to function #139

chore!: rename algo to function #139

ThibaultFy commented Jan 31, 2023 •

edited

Loading

guilhem-barthes Feb 1, 2023

ThibaultFy Feb 1, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes left a comment

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

guilhem-barthes Feb 10, 2023

ThibaultFy Feb 10, 2023

guilhem-barthes Feb 10, 2023

ThibaultFy Feb 10, 2023

guilhem-barthes Feb 10, 2023 •

edited

Loading

ThibaultFy Feb 10, 2023

guilhem-barthes Feb 10, 2023 •

edited

Loading

guilhem-barthes Feb 10, 2023

guilhem-barthes left a comment

	functionService asset.FunctionServiceClient
	functionService asset.FunctionServiceClient

	functionService: asset.NewFunctionServiceClient(f.conn),
	functionService: asset.NewFunctionServiceClient(f.conn),

	FunctionRef: DefaultSimpleFunctionRef,
	FunctionRef: DefaultSimpleFunctionRef,

	FunctionKey: ks.GetKey(o.FunctionRef),
	FunctionKey: ks.GetKey(o.FunctionRef),

	FunctionRef: DefaultPredictFunctionRef,
	FunctionRef: DefaultPredictFunctionRef,

chore!: rename algo to function #139

chore!: rename algo to function #139

Conversation

ThibaultFy commented Jan 31, 2023 • edited Loading

Description

Companion PRs

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guilhem-barthes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guilhem-barthes Feb 10, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guilhem-barthes Feb 10, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guilhem-barthes left a comment

Choose a reason for hiding this comment

ThibaultFy commented Jan 31, 2023 •

edited

Loading

guilhem-barthes Feb 10, 2023 •

edited

Loading

guilhem-barthes Feb 10, 2023 •

edited

Loading