Skip to content

Web console: add ability to make inputFormat part of the example datasets #13402

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.

Sign up for GitHub

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

Merged
gianm merged 1 commit into from
Nov 21, 2022
Merged

Web console: add ability to make inputFormat part of the example datasets #13402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 64 additions & 3 deletions web-console/src/views/workbench-view/input-source-step/example-inputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,74 @@
* limitations under the License.
*/

import { InputSource } from '../../../druid-models';
import { InputFormat, InputSource } from '../../../druid-models';

export interface ExampleInputSource {
export interface ExampleInput {
name: string;
description: string;
inputSource: InputSource;
inputFormat?: InputFormat;
}

export const EXAMPLE_INPUT_SOURCES: ExampleInputSource[] = [
const TRIPS_INPUT_FORMAT: InputFormat = {
type: 'csv',
findColumnsFromHeader: false,
columns: [
'trip_id',
'vendor_id',
'pickup_datetime',
'dropoff_datetime',
'store_and_fwd_flag',
'rate_code_id',
'pickup_longitude',
'pickup_latitude',
'dropoff_longitude',
'dropoff_latitude',
'passenger_count',
'trip_distance',
'fare_amount',
'extra',
'mta_tax',
'tip_amount',
'tolls_amount',
'ehail_fee',
'improvement_surcharge',
'total_amount',
'payment_type',
'trip_type',
'pickup',
'dropoff',
'cab_type',
'precipitation',
'snow_depth',
'snowfall',
'max_temperature',
'min_temperature',
'average_wind_speed',
'pickup_nyct2010_gid',
'pickup_ctlabel',
'pickup_borocode',
'pickup_boroname',
'pickup_ct2010',
'pickup_boroct2010',
'pickup_cdeligibil',
'pickup_ntacode',
'pickup_ntaname',
'pickup_puma',
'dropoff_nyct2010_gid',
'dropoff_ctlabel',
'dropoff_borocode',
'dropoff_boroname',
'dropoff_ct2010',
'dropoff_boroct2010',
'dropoff_cdeligibil',
'dropoff_ntacode',
'dropoff_ntaname',
'dropoff_puma',
],
};

export const EXAMPLE_INPUTS: ExampleInput[] = [
{
name: 'Wikipedia',
description: 'One day of wikipedia edits (JSON)',
Expand Down Expand Up @@ -62,6 +121,7 @@ export const EXAMPLE_INPUT_SOURCES: ExampleInputSource[] = [
'https://static.imply.io/example-data/trips/trips_xac.csv.gz',
],
},
inputFormat: TRIPS_INPUT_FORMAT,
},
{
name: 'NYC Taxi cabs (all files)',
Expand Down Expand Up @@ -145,6 +205,7 @@ export const EXAMPLE_INPUT_SOURCES: ExampleInputSource[] = [
'https://static.imply.io/example-data/trips/trips_xcv.csv.gz',
],
},
inputFormat: TRIPS_INPUT_FORMAT,
},
{
name: 'FlightCarrierOnTime (1 month)',
Expand Down
36 changes: 22 additions & 14 deletions web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import { UrlBaser } from '../../../singletons';
import { filterMap, IntermediateQueryState } from '../../../utils';
import { postToSampler, SampleSpec } from '../../../utils/sampler';

import { EXAMPLE_INPUT_SOURCES } from './example-inputs';
import { EXAMPLE_INPUTS } from './example-inputs';
import { InputSourceInfo } from './input-source-info';

import './input-source-step.scss';
Expand All @@ -81,16 +81,15 @@ export const InputSourceStep = React.memo(function InputSourceStep(props: InputS
const [inputSource, setInputSource] = useState<Partial<InputSource> | string | undefined>(
initInputSource,
);
const exampleInputSource = EXAMPLE_INPUT_SOURCES.find(
({ name }) => name === inputSource,
)?.inputSource;
const exampleInput = EXAMPLE_INPUTS.find(({ name }) => name === inputSource);

const [guessedInputFormatState, connectQueryManager] = useQueryManager<
InputSource,
{ inputSource: InputSource; suggestedInputFormat?: InputFormat },
InputFormat,
Execution
>({
processQuery: async (inputSource: InputSource, cancelToken) => {
processQuery: async ({ inputSource, suggestedInputFormat }, cancelToken) => {
let guessedInputFormat: InputFormat | undefined;
if (mode === 'sampler') {
const sampleSpec: SampleSpec = {
type: 'index_parallel',
Expand Down Expand Up @@ -127,7 +126,7 @@ export const InputSourceStep = React.memo(function InputSourceStep(props: InputS
);

if (!sampleLines.length) throw new Error('No data returned from sampler');
return guessInputFormat(sampleLines);
guessedInputFormat = guessInputFormat(sampleLines);
} else {
const tableExpression = externalConfigToTableExpression({
inputSource,
Expand All @@ -151,8 +150,14 @@ export const InputSourceStep = React.memo(function InputSourceStep(props: InputS
);

if (result instanceof IntermediateQueryState) return result;
return resultToInputFormat(result);
guessedInputFormat = resultToInputFormat(result);
}

if (suggestedInputFormat?.type === guessedInputFormat.type) {
return suggestedInputFormat;
}

return guessedInputFormat;
},
backgroundStatusCheck: async (execution, query, cancelToken) => {
const result = await executionBackgroundResultStatusCheck(execution, query, cancelToken);
Expand All @@ -164,7 +169,7 @@ export const InputSourceStep = React.memo(function InputSourceStep(props: InputS
useEffect(() => {
const guessedInputFormat = guessedInputFormatState.data;
if (!guessedInputFormat) return;
onSet(exampleInputSource || (inputSource as any), guessedInputFormat);
onSet(exampleInput?.inputSource || (inputSource as any), guessedInputFormat);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [guessedInputFormatState]);

Expand Down Expand Up @@ -217,7 +222,7 @@ export const InputSourceStep = React.memo(function InputSourceStep(props: InputS
selectedValue={inputSource}
onChange={e => setInputSource(e.currentTarget.value)}
>
{EXAMPLE_INPUT_SOURCES.map((e, i) => (
{EXAMPLE_INPUTS.map((e, i) => (
<Radio
key={i}
labelElement={
Expand Down Expand Up @@ -306,10 +311,13 @@ export const InputSourceStep = React.memo(function InputSourceStep(props: InputS
text={guessedInputFormatState.isLoading() ? 'Loading...' : 'Use example'}
rightIcon={IconNames.ARROW_RIGHT}
intent={Intent.PRIMARY}
disabled={!exampleInputSource || guessedInputFormatState.isLoading()}
disabled={!exampleInput || guessedInputFormatState.isLoading()}
onClick={() => {
if (!exampleInputSource) return;
connectQueryManager.runQuery(exampleInputSource);
if (!exampleInput) return;
connectQueryManager.runQuery({
inputSource: exampleInput.inputSource,
suggestedInputFormat: exampleInput.inputFormat,
});
}}
/>
) : inputSource ? (
Expand All @@ -324,7 +332,7 @@ export const InputSourceStep = React.memo(function InputSourceStep(props: InputS
}
onClick={() => {
if (!AutoForm.isValidModel(inputSource, INPUT_SOURCE_FIELDS)) return;
connectQueryManager.runQuery(inputSource);
connectQueryManager.runQuery({ inputSource });
}}
/>
) : undefined}
Expand Down