Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a get-manifest API method (#2168) #2232

Merged
merged 1 commit into from
Mar 24, 2020
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## dbt next (release TBD)

### Features
- Added a `get-manifest` API call. ([#2168](https:/fishtown-analytics/dbt/issues/2168), [#2232](https:/fishtown-analytics/dbt/pull/2232))

### Fixes
- When a jinja value is undefined, give a helpful error instead of failing with cryptic "cannot pickle ParserMacroCapture" errors ([#2110](https:/fishtown-analytics/dbt/issues/2110), [#2184](https:/fishtown-analytics/dbt/pull/2184))

Expand Down
37 changes: 37 additions & 0 deletions core/dbt/contracts/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from hologram.helpers import StrEnum

from dbt.contracts.graph.compiled import CompileResultNode
from dbt.contracts.graph.manifest import WritableManifest
from dbt.contracts.results import (
TimingInfo,
CatalogResults,
Expand Down Expand Up @@ -143,8 +144,13 @@ class RPCSourceFreshnessParameters(RPCParameters):
select: Union[None, str, List[str]] = None


@dataclass
class GetManifestParameters(RPCParameters):
pass

# Outputs


@dataclass
class RemoteResult(JsonSchemaMixin):
logs: List[LogMessage]
Expand Down Expand Up @@ -322,6 +328,11 @@ class KillResult(RemoteResult):
logs: List[LogMessage] = field(default_factory=list)


@dataclass
class GetManifestResult(RemoteResult):
manifest: Optional[WritableManifest]


# this is kind of carefuly structured: BlocksManifestTasks is implied by
# RequiresConfigReloadBefore and RequiresManifestReloadAfter
class RemoteMethodFlags(enum.Flag):
Expand Down Expand Up @@ -526,8 +537,34 @@ class PollInProgressResult(PollResult):
pass


@dataclass
class PollGetManifestResult(GetManifestResult, PollResult):
state: TaskHandlerState = field(
metadata=restrict_to(TaskHandlerState.Success,
TaskHandlerState.Failed),
)

@classmethod
def from_result(
cls: Type['PollGetManifestResult'],
base: GetManifestResult,
tags: TaskTags,
timing: TaskTiming,
logs: List[LogMessage],
) -> 'PollGetManifestResult':
return cls(
manifest=base.manifest,
logs=logs,
tags=tags,
state=timing.state,
start=timing.start,
end=timing.end,
elapsed=timing.elapsed,
)

# Manifest parsing types


class ManifestStatus(StrEnum):
Init = 'init'
Compiling = 'compiling'
Expand Down
5 changes: 5 additions & 0 deletions core/dbt/rpc/builtins.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
LastParse,
GCParameters,
GCResult,
GetManifestResult,
KillParameters,
KillResult,
KillResultStatus,
Expand All @@ -27,6 +28,7 @@
PollInProgressResult,
PollKilledResult,
PollExecuteCompleteResult,
PollGetManifestResult,
PollRunCompleteResult,
PollCompileCompleteResult,
PollCatalogCompleteResult,
Expand Down Expand Up @@ -144,6 +146,7 @@ def poll_complete(
PollCatalogCompleteResult,
PollRemoteEmptyCompleteResult,
PollRunOperationCompleteResult,
PollGetManifestResult
]]

if isinstance(result, RemoteExecutionResult):
Expand All @@ -159,6 +162,8 @@ def poll_complete(
cls = PollRemoteEmptyCompleteResult
elif isinstance(result, RemoteRunOperationResult):
cls = PollRunOperationCompleteResult
elif isinstance(result, GetManifestResult):
cls = PollGetManifestResult
else:
raise dbt.exceptions.InternalException(
'got invalid result in poll_complete: {}'.format(result)
Expand Down
31 changes: 30 additions & 1 deletion core/dbt/task/rpc/project_commands.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from datetime import datetime
from typing import List, Optional, Union


from dbt.contracts.graph.manifest import WritableManifest
from dbt.contracts.rpc import (
GetManifestParameters,
GetManifestResult,
RPCCompileParameters,
RPCDocsGenerateParameters,
RPCRunOperationParameters,
Expand Down Expand Up @@ -188,3 +190,30 @@ def set_args(self, params: RPCSourceFreshnessParameters) -> None:
if params.threads is not None:
self.args.threads = params.threads
self.args.output = None


# this is a weird and special method.
class GetManifest(
RemoteManifestMethod[GetManifestParameters, GetManifestResult]
):
METHOD_NAME = 'get-manifest'

def set_args(self, params: GetManifestParameters) -> None:
self.args.models = None
self.args.exclude = None

def handle_request(self) -> GetManifestResult:
task = RemoteCompileProjectTask(self.args, self.config, self.manifest)
task.handle_request()

manifest: Optional[WritableManifest] = None
if task.manifest is not None:
manifest = task.manifest.writable_manifest()

return GetManifestResult(
logs=[],
manifest=manifest,
)

def interpret_results(self, results):
return results.manifest is not None
29 changes: 29 additions & 0 deletions test/rpc/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -885,3 +885,32 @@ def test_rpc_vars(
results = querier.async_wait_for_result(querier.cli_args('run --vars "{param: 100}"'))
assert len(results['results']) == 1
assert results['results'][0]['node']['compiled_sql'] == 'select 100 as id'


def test_get_manifest(
project_root, profiles_root, postgres_profile, unique_schema
):
project = ProjectDefinition(
models={
'my_model.sql': 'select 1 as id',
},
)
querier_ctx = get_querier(
project_def=project,
project_dir=project_root,
profiles_dir=profiles_root,
schema=unique_schema,
test_kwargs={},
)

with querier_ctx as querier:
results = querier.async_wait_for_result(querier.cli_args('run'))
assert len(results['results']) == 1
assert results['results'][0]['node']['compiled_sql'] == 'select 1 as id'
result = querier.async_wait_for_result(querier.get_manifest())
assert 'manifest' in result
manifest = result['manifest']
assert manifest['nodes']['model.test.my_model']['raw_sql'] == 'select 1 as id'
assert 'manifest' in result
manifest = result['manifest']
assert manifest['nodes']['model.test.my_model']['compiled_sql'] == 'select 1 as id'
5 changes: 5 additions & 0 deletions test/rpc/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,11 @@ def run_sql(
method='run_sql', params=params, request_id=request_id
)

def get_manifest(self, request_id=1):
return self.request(
method='get-manifest', params={}, request_id=request_id
)

def is_result(self, data: Dict[str, Any], id=None) -> Dict[str, Any]:
if id is not None:
assert data['id'] == id
Expand Down