Skip to content

Commit

Permalink
fix: Add CODE_SNIPPET_USE_AUTO_CONFIG environment variable (#883)
Browse files Browse the repository at this point in the history
* Add CODE_SNIPPET_USE_AUTO_CONFIG environment variable

Signed-off-by: ddl-rliu <[email protected]>

* Fix eslint

Signed-off-by: ddl-rliu <[email protected]>

---------

Signed-off-by: ddl-rliu <[email protected]>
  • Loading branch information
ddl-rliu authored Jul 25, 2024
1 parent 7636e32 commit 8b0d3cc
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 11 deletions.
6 changes: 6 additions & 0 deletions packages/common/src/environment/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ export interface Env extends NodeJS.ProcessEnv {
* @example MAINTENANCE_MODE="We are currently down for maintenance.\n\nPlease try again later."
*/
MAINTENANCE_MODE?: string;

/**
* Controls whether the config object in the inputs/outputs Python code snippet is automatically constructed
* Leave unset to use the config object for endpoint window.location.host
*/
CODE_SNIPPET_USE_AUTO_CONFIG?: string;
}

/** Represents a plain object where string keys map to values of the same type */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
import { prism } from 'react-syntax-highlighter/dist/esm/styles/prism';
import FileCopyIcon from '@mui/icons-material/FileCopy';
import copyToClipboard from 'copy-to-clipboard';
import { env } from '@clients/common/environment';
import { errorBackgroundColor } from '@clients/theme/CommonStyles/constants';
import Button from '@mui/material/Button';
import Typography from '@mui/material/Typography';
Expand Down Expand Up @@ -31,19 +32,19 @@ export const ExecutionNodeURL: React.FC<{
const isHttps = /^https:/.test(window.location.href);
const ref = React.useRef<HTMLDivElement>(null);

const code = isHttps
? // https snippet
`from flytekit.remote.remote import FlyteRemote
const config =
// eslint-disable-next-line no-nested-ternary
env.CODE_SNIPPET_USE_AUTO_CONFIG === "true"
? 'Config.auto()'
: isHttps
? // https snippet
`Config.for_endpoint("${window.location.host}")`
: // http snippet
`Config.for_endpoint("${window.location.host}", True)`;
const code = `from flytekit.remote.remote import FlyteRemote
from flytekit.configuration import Config
remote = FlyteRemote(
Config.for_endpoint("${window.location.host}"),
)
remote.get("${dataSourceURI}")`
: // http snippet
`from flytekit.remote.remote import FlyteRemote
from flytekit.configuration import Config
remote = FlyteRemote(
Config.for_endpoint("${window.location.host}", True),
${config},
)
remote.get("${dataSourceURI}")`;

Expand Down
7 changes: 7 additions & 0 deletions website/console/env/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ const ASSETS_PATH = `${BASE_URL}/assets/`;
*/
const MAINTENANCE_MODE = process.env.MAINTENANCE_MODE || '';

/**
* Controls whether the config object in the inputs/outputs Python code snippet is automatically constructed
*/
const CODE_SNIPPET_USE_AUTO_CONFIG = process.env.CODE_SNIPPET_USE_AUTO_CONFIG || '';

const processEnv = {
NODE_ENV,
PORT,
Expand All @@ -86,6 +91,7 @@ const processEnv = {
BASE_HREF,
DISABLE_CONSOLE_ROUTE_PREFIX,
MAINTENANCE_MODE,
CODE_SNIPPET_USE_AUTO_CONFIG,
};

export {
Expand All @@ -101,5 +107,6 @@ export {
ADMIN_API,
LOCAL_DEV_HOST,
MAINTENANCE_MODE,
CODE_SNIPPET_USE_AUTO_CONFIG,
processEnv,
};

0 comments on commit 8b0d3cc

Please sign in to comment.