merge main

Author: grutt

internal/services/admin/v1/server.go

@@ -937,7 +937,7 @@ func getCreateTaskOpts(tasks []*contracts.CreateTaskOpts, kind string) ([]v1.Cre
 
 					orGroupIdStr := userEventCondition.Base.OrGroupId
 
-					if orGroupIdStr == "" {
+					if orGroupIdStr == "" || orGroupIdStr == uuid.Nil.String() {
 						orGroupIdStr = uuid.New().String()
 					}
 
@@ -971,7 +971,7 @@ func getCreateTaskOpts(tasks []*contracts.CreateTaskOpts, kind string) ([]v1.Cre
 
 					orGroupIdStr := sleepCondition.Base.OrGroupId
 
-					if orGroupIdStr == "" {
+					if orGroupIdStr == "" || orGroupIdStr == uuid.Nil.String() {
 						orGroupIdStr = uuid.New().String()
 					}
 
@@ -1002,7 +1002,7 @@ func getCreateTaskOpts(tasks []*contracts.CreateTaskOpts, kind string) ([]v1.Cre
 
 					orGroupIdStr := parentOverrideCondition.Base.OrGroupId
 
-					if orGroupIdStr == "" {
+					if orGroupIdStr == "" || orGroupIdStr == uuid.Nil.String() {
 						orGroupIdStr = uuid.New().String()
 					}
 

pkg/client/dispatcher.go

@@ -42,14 +42,14 @@ const (
 )
 
 type GetActionListenerRequest struct {
-	WorkerName     string
-	Services       []string
-	Actions        []string
-	Slots          *int
-	DurableSlots   *int
-	SlotConfig map[string]int32
-	Labels         map[string]interface{}
-	WebhookId      *string
+	WorkerName   string
+	Services     []string
+	Actions      []string
+	Slots        *int
+	DurableSlots *int
+	SlotConfig   map[string]int32
+	Labels       map[string]interface{}
+	WebhookId    *string
 }
 
 // ActionPayload unmarshals the action payload into the target. It also validates the resulting target.

pkg/worker/worker.go

@@ -120,8 +120,8 @@ type WorkerOpts struct {
 	name   string
 	l      *zerolog.Logger
 
-	integrations   []integrations.Integration
-	alerter        errors.Alerter
+	integrations []integrations.Integration
+	alerter      errors.Alerter
 	slots        *int
 	durableSlots *int
 	slotConfig   map[string]int32
@@ -482,12 +482,12 @@ func (w *Worker) startBlocking(ctx context.Context) error {
 	_ = NewManagedCompute(&w.actions, w.client, 1)
 
 	listener, id, err := w.client.Dispatcher().GetActionListener(ctx, &client.GetActionListenerRequest{
-		WorkerName:     w.name,
-		Actions:        actionNames,
-		Slots:          w.slots,
-		Labels:         w.labels,
-		DurableSlots:   w.durableSlots,
-		SlotConfig: w.slotConfig,
+		WorkerName:   w.name,
+		Actions:      actionNames,
+		Slots:        w.slots,
+		Labels:       w.labels,
+		DurableSlots: w.durableSlots,
+		SlotConfig:   w.slotConfig,
 	})
 
 	w.id = id

sdks/python/hatchet_sdk/clients/rest/__init__.py

@@ -19,16 +19,15 @@
 # import apis into sdk package
 from hatchet_sdk.clients.rest.api.api_token_api import APITokenApi
 from hatchet_sdk.clients.rest.api.cel_api import CELApi
-from hatchet_sdk.clients.rest.api.default_api import DefaultApi
 from hatchet_sdk.clients.rest.api.event_api import EventApi
 from hatchet_sdk.clients.rest.api.filter_api import FilterApi
 from hatchet_sdk.clients.rest.api.github_api import GithubApi
 from hatchet_sdk.clients.rest.api.healthcheck_api import HealthcheckApi
 from hatchet_sdk.clients.rest.api.log_api import LogApi
 from hatchet_sdk.clients.rest.api.metadata_api import MetadataApi
 from hatchet_sdk.clients.rest.api.rate_limits_api import RateLimitsApi
-from hatchet_sdk.clients.rest.api.slack_api import SlackApi
 from hatchet_sdk.clients.rest.api.sns_api import SNSApi
+from hatchet_sdk.clients.rest.api.slack_api import SlackApi
 from hatchet_sdk.clients.rest.api.step_run_api import StepRunApi
 from hatchet_sdk.clients.rest.api.task_api import TaskApi
 from hatchet_sdk.clients.rest.api.tenant_api import TenantApi
@@ -38,20 +37,18 @@
 from hatchet_sdk.clients.rest.api.workflow_api import WorkflowApi
 from hatchet_sdk.clients.rest.api.workflow_run_api import WorkflowRunApi
 from hatchet_sdk.clients.rest.api.workflow_runs_api import WorkflowRunsApi
-from hatchet_sdk.clients.rest.api_client import ApiClient
+from hatchet_sdk.clients.rest.api.default_api import DefaultApi
 
 # import ApiClient
 from hatchet_sdk.clients.rest.api_response import ApiResponse
+from hatchet_sdk.clients.rest.api_client import ApiClient
 from hatchet_sdk.clients.rest.configuration import Configuration
-from hatchet_sdk.clients.rest.exceptions import (
-    ApiAttributeError,
-    ApiException,
-    ApiKeyError,
-    ApiTypeError,
-    ApiValueError,
-    OpenApiException,
-)
-from hatchet_sdk.clients.rest.models.accept_invite_request import AcceptInviteRequest
+from hatchet_sdk.clients.rest.exceptions import OpenApiException
+from hatchet_sdk.clients.rest.exceptions import ApiTypeError
+from hatchet_sdk.clients.rest.exceptions import ApiValueError
+from hatchet_sdk.clients.rest.exceptions import ApiKeyError
+from hatchet_sdk.clients.rest.exceptions import ApiAttributeError
+from hatchet_sdk.clients.rest.exceptions import ApiException
 
 # import models into sdk package
 from hatchet_sdk.clients.rest.models.api_error import APIError
@@ -62,6 +59,7 @@
 from hatchet_sdk.clients.rest.models.api_meta_posthog import APIMetaPosthog
 from hatchet_sdk.clients.rest.models.api_resource_meta import APIResourceMeta
 from hatchet_sdk.clients.rest.models.api_token import APIToken
+from hatchet_sdk.clients.rest.models.accept_invite_request import AcceptInviteRequest
 from hatchet_sdk.clients.rest.models.bulk_create_event_request import (
     BulkCreateEventRequest,
 )
@@ -131,8 +129,8 @@
 from hatchet_sdk.clients.rest.models.list_pull_requests_response import (
     ListPullRequestsResponse,
 )
-from hatchet_sdk.clients.rest.models.list_slack_webhooks import ListSlackWebhooks
 from hatchet_sdk.clients.rest.models.list_sns_integrations import ListSNSIntegrations
+from hatchet_sdk.clients.rest.models.list_slack_webhooks import ListSlackWebhooks
 from hatchet_sdk.clients.rest.models.log_line import LogLine
 from hatchet_sdk.clients.rest.models.log_line_level import LogLineLevel
 from hatchet_sdk.clients.rest.models.log_line_list import LogLineList
@@ -163,6 +161,7 @@
     ReplayWorkflowRunsResponse,
 )
 from hatchet_sdk.clients.rest.models.rerun_step_run_request import RerunStepRunRequest
+from hatchet_sdk.clients.rest.models.sns_integration import SNSIntegration
 from hatchet_sdk.clients.rest.models.schedule_workflow_run_request import (
     ScheduleWorkflowRunRequest,
 )
@@ -200,7 +199,6 @@
 )
 from hatchet_sdk.clients.rest.models.semaphore_slots import SemaphoreSlots
 from hatchet_sdk.clients.rest.models.slack_webhook import SlackWebhook
-from hatchet_sdk.clients.rest.models.sns_integration import SNSIntegration
 from hatchet_sdk.clients.rest.models.step import Step
 from hatchet_sdk.clients.rest.models.step_run import StepRun
 from hatchet_sdk.clients.rest.models.step_run_archive import StepRunArchive
@@ -268,13 +266,13 @@
     UserTenantMembershipsList,
 )
 from hatchet_sdk.clients.rest.models.user_tenant_public import UserTenantPublic
-from hatchet_sdk.clients.rest.models.v1_cancel_task_request import V1CancelTaskRequest
-from hatchet_sdk.clients.rest.models.v1_cancelled_tasks import V1CancelledTasks
 from hatchet_sdk.clients.rest.models.v1_cel_debug_request import V1CELDebugRequest
 from hatchet_sdk.clients.rest.models.v1_cel_debug_response import V1CELDebugResponse
 from hatchet_sdk.clients.rest.models.v1_cel_debug_response_status import (
     V1CELDebugResponseStatus,
 )
+from hatchet_sdk.clients.rest.models.v1_cancel_task_request import V1CancelTaskRequest
+from hatchet_sdk.clients.rest.models.v1_cancelled_tasks import V1CancelledTasks
 from hatchet_sdk.clients.rest.models.v1_create_filter_request import (
     V1CreateFilterRequest,
 )

sdks/python/hatchet_sdk/clients/rest/api/__init__.py

@@ -3,16 +3,15 @@
 # import apis into api package
 from hatchet_sdk.clients.rest.api.api_token_api import APITokenApi
 from hatchet_sdk.clients.rest.api.cel_api import CELApi
-from hatchet_sdk.clients.rest.api.default_api import DefaultApi
 from hatchet_sdk.clients.rest.api.event_api import EventApi
 from hatchet_sdk.clients.rest.api.filter_api import FilterApi
 from hatchet_sdk.clients.rest.api.github_api import GithubApi
 from hatchet_sdk.clients.rest.api.healthcheck_api import HealthcheckApi
 from hatchet_sdk.clients.rest.api.log_api import LogApi
 from hatchet_sdk.clients.rest.api.metadata_api import MetadataApi
 from hatchet_sdk.clients.rest.api.rate_limits_api import RateLimitsApi
-from hatchet_sdk.clients.rest.api.slack_api import SlackApi
 from hatchet_sdk.clients.rest.api.sns_api import SNSApi
+from hatchet_sdk.clients.rest.api.slack_api import SlackApi
 from hatchet_sdk.clients.rest.api.step_run_api import StepRunApi
 from hatchet_sdk.clients.rest.api.task_api import TaskApi
 from hatchet_sdk.clients.rest.api.tenant_api import TenantApi
@@ -22,3 +21,4 @@
 from hatchet_sdk.clients.rest.api.workflow_api import WorkflowApi
 from hatchet_sdk.clients.rest.api.workflow_run_api import WorkflowRunApi
 from hatchet_sdk.clients.rest.api.workflow_runs_api import WorkflowRunsApi
+from hatchet_sdk.clients.rest.api.default_api import DefaultApi

sdks/python/hatchet_sdk/clients/rest/api/api_token_api.py

@@ -12,13 +12,13 @@
 """  # noqa: E501
 
 import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
-
-from pydantic import Field, StrictFloat, StrictInt, StrictStr, validate_call
 from typing_extensions import Annotated
 
-from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
-from hatchet_sdk.clients.rest.api_response import ApiResponse
+from pydantic import Field
+from typing import Optional
+from typing_extensions import Annotated
 from hatchet_sdk.clients.rest.models.create_api_token_request import (
     CreateAPITokenRequest,
 )
@@ -28,6 +28,9 @@
 from hatchet_sdk.clients.rest.models.list_api_tokens_response import (
     ListAPITokensResponse,
 )
+
+from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
+from hatchet_sdk.clients.rest.api_response import ApiResponse
 from hatchet_sdk.clients.rest.rest import RESTResponseType
 
 

sdks/python/hatchet_sdk/clients/rest/api/cel_api.py

@@ -12,15 +12,17 @@
 """  # noqa: E501
 
 import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
 
-from pydantic import Field, StrictFloat, StrictInt, StrictStr, validate_call
+from pydantic import Field
 from typing_extensions import Annotated
+from hatchet_sdk.clients.rest.models.v1_cel_debug_request import V1CELDebugRequest
+from hatchet_sdk.clients.rest.models.v1_cel_debug_response import V1CELDebugResponse
 
 from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
 from hatchet_sdk.clients.rest.api_response import ApiResponse
-from hatchet_sdk.clients.rest.models.v1_cel_debug_request import V1CELDebugRequest
-from hatchet_sdk.clients.rest.models.v1_cel_debug_response import V1CELDebugResponse
 from hatchet_sdk.clients.rest.rest import RESTResponseType
 
 

sdks/python/hatchet_sdk/clients/rest/api/default_api.py

@@ -12,13 +12,13 @@
 """  # noqa: E501
 
 import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
-
-from pydantic import Field, StrictFloat, StrictInt, StrictStr, validate_call
 from typing_extensions import Annotated
 
-from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
-from hatchet_sdk.clients.rest.api_response import ApiResponse
+from pydantic import Field
+from typing import Optional
+from typing_extensions import Annotated
 from hatchet_sdk.clients.rest.models.info_get_version200_response import (
     InfoGetVersion200Response,
 )
@@ -36,6 +36,9 @@
 from hatchet_sdk.clients.rest.models.webhook_worker_request_list_response import (
     WebhookWorkerRequestListResponse,
 )
+
+from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
+from hatchet_sdk.clients.rest.api_response import ApiResponse
 from hatchet_sdk.clients.rest.rest import RESTResponseType
 
 

sdks/python/hatchet_sdk/clients/rest/api/event_api.py

@@ -12,14 +12,14 @@
 """  # noqa: E501
 
 import warnings
-from datetime import datetime
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
-
-from pydantic import Field, StrictFloat, StrictInt, StrictStr, validate_call
 from typing_extensions import Annotated
 
-from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
-from hatchet_sdk.clients.rest.api_response import ApiResponse
+from datetime import datetime
+from pydantic import Field, StrictInt, StrictStr
+from typing import List, Optional
+from typing_extensions import Annotated
 from hatchet_sdk.clients.rest.models.bulk_create_event_request import (
     BulkCreateEventRequest,
 )
@@ -42,6 +42,9 @@
 from hatchet_sdk.clients.rest.models.v1_event_list import V1EventList
 from hatchet_sdk.clients.rest.models.v1_task_status import V1TaskStatus
 from hatchet_sdk.clients.rest.models.workflow_run_status import WorkflowRunStatus
+
+from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
+from hatchet_sdk.clients.rest.api_response import ApiResponse
 from hatchet_sdk.clients.rest.rest import RESTResponseType
 
 

sdks/python/hatchet_sdk/clients/rest/api/filter_api.py

@@ -12,13 +12,13 @@
 """  # noqa: E501
 
 import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
-
-from pydantic import Field, StrictFloat, StrictInt, StrictStr, validate_call
 from typing_extensions import Annotated
 
-from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
-from hatchet_sdk.clients.rest.api_response import ApiResponse
+from pydantic import Field, StrictInt, StrictStr
+from typing import List, Optional
+from typing_extensions import Annotated
 from hatchet_sdk.clients.rest.models.v1_create_filter_request import (
     V1CreateFilterRequest,
 )
@@ -27,6 +27,9 @@
 from hatchet_sdk.clients.rest.models.v1_update_filter_request import (
     V1UpdateFilterRequest,
 )
+
+from hatchet_sdk.clients.rest.api_client import ApiClient, RequestSerialized
+from hatchet_sdk.clients.rest.api_response import ApiResponse
 from hatchet_sdk.clients.rest.rest import RESTResponseType