Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,6 @@ def __init__(
# Set after the job is submitted, parsed from the job submission response.
self.job_name: str | None = None

if self.spec_text and (self.spec or self.spec_stage):
raise ValueError("Cannot specify both 'spec_text' and 'spec'/'spec_stage'")
if not self.spec_text and not (self.spec and self.spec_stage):
raise ValueError("Must provide either 'spec_text' or both 'spec' and 'spec_stage'")

@cached_property
def _hook(self) -> SnowflakeHook:
return SnowflakeHook(
Expand Down Expand Up @@ -237,6 +232,11 @@ def on_kill(self) -> None:

def execute(self, context: Context) -> str:
"""Submit and optionally wait for a Snowpark Container Services job."""
if self.spec_text and (self.spec or self.spec_stage):
raise ValueError("Cannot specify both 'spec_text' and 'spec'/'spec_stage'")
if not self.spec_text and not (self.spec and self.spec_stage):
raise ValueError("Must provide either 'spec_text' or both 'spec' and 'spec_stage'")

self.job_name = self._submit_job()
if not self.job_name:
raise RuntimeError("Job name was not returned")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ class TestSnowparkContainerJobOperator:
),
)
def test_invalid_spec_combinations(self, kwargs, match):
op = _make_operator(**kwargs)
with pytest.raises(ValueError, match=match):
_make_operator(**kwargs)
op.execute(context=None)

def test_build_sql_with_spec_stage(self):
op = _make_operator()
Expand Down
1 change: 0 additions & 1 deletion scripts/ci/prek/validate_operators_init_exemptions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ providers/microsoft/psrp/src/airflow/providers/microsoft/psrp/operators/psrp.py:
providers/neo4j/src/airflow/providers/neo4j/operators/neo4j.py::Neo4jOperator
providers/oracle/src/airflow/providers/oracle/transfers/oracle_to_oracle.py::OracleToOracleOperator
providers/papermill/src/airflow/providers/papermill/operators/papermill.py::PapermillOperator
providers/snowflake/src/airflow/providers/snowflake/operators/snowpark_containers.py::SnowparkContainerJobOperator
providers/ssh/src/airflow/providers/ssh/operators/ssh.py::SSHOperator
providers/ssh/src/airflow/providers/ssh/operators/ssh_remote_job.py::SSHRemoteJobOperator
providers/standard/src/airflow/providers/standard/operators/bash.py::BashOperator
Expand Down