conflict_resolution
stringlengths
27
16k
<<<<<<< import {GENESIS_EPOCH, MAX_CROSSLINK_EPOCHS, ZERO_HASH} from "../../../constants"; ======= import { ZERO_HASH, GENESIS_EPOCH, GENESIS_START_SHARD } from "../../../constants"; >>>>>>> import { ZERO_HASH, GENESIS_EPOCH, GENESIS_START_SHARD } from "../../../constants"; <<<<<<< const shardAttestations...
<<<<<<< public url: string; public beacon: IBeaconApi; ======= public beacon!: IBeaconApi; >>>>>>> public url: string; public beacon!: IBeaconApi; <<<<<<< public constructor(opts: RpcClientOverWsOpts, {config}: {config: IBeaconConfig}) { ======= private rpcUrl: string; public constructor(opts: IR...
<<<<<<< import varint from "varint"; import StrictEventEmitter from "strict-event-emitter-types"; import { RequestBody, ResponseBody, Hello, Goodbye, BeaconBlocksByRangeRequest, BeaconBlocksByRangeResponse, BeaconBlocksByRootRequest, BeaconBlocksByRootResponse, } from "@chainsafe/eth2.0-types"; import {serializ...
<<<<<<< limit: params.MAX_DEPOSITS, })], ["voluntaryExits", new ListType({ elementType: ssz.VoluntaryExit, limit: params.MAX_VOLUNTARY_EXITS, })], ======= maxLength: params.MAX_DEPOSITS, }], ["voluntaryExits", { elementType: ssz.SignedVoluntaryExit, maxLength: p...
<<<<<<< try { const data = await assembleAttestationData(config, db, state, headBlock, slot, index); return { aggregationBits, data, signature: undefined }; } catch (e) { throw e; } ======= const custodyBits = getEmptyBitList(committee.length); const data = await assembleAt...
<<<<<<< import {Bucket, DB_PREFIX_LENGTH, encodeKey, IDatabaseApiOptions, uintLen} from "@chainsafe/lodestar-db"; import {BLSPubkey, SlashingProtectionBlock, Slot} from "@chainsafe/lodestar-types"; import {bytesToInt, intToBytes} from "@chainsafe/lodestar-utils"; ======= import {BLSPubkey, phase0, Slot} from "@chains...
<<<<<<< ======= import {equals, signingRoot} from "@chainsafe/ssz"; import {verify} from "@chainsafe/bls"; >>>>>>> <<<<<<< assert(isValidProposerSlashing(config, state, proposerSlashing)); ======= const proposer = state.validators[proposerSlashing.proposerIndex]; const header1Epoch = computeEpochOfSlot(conf...
<<<<<<< this.chain.on("finalizedCheckpoint", this.handleFinalizedCheckpointChores); this.network.gossip.on("gossip:start", this.handleGossipStart); this.network.gossip.on("gossip:stop", this.handleGossipStop); ======= this.chain.forkChoice.on("prune", this.handleFinalizedCheckpointChores); await t...
<<<<<<< import { BeaconState, BLSPubkey, CommitteeIndex, Epoch, FinalityCheckpoints, Root, Slot, ValidatorBalance, ValidatorIndex, BeaconCommitteeResponse, } from "@chainsafe/lodestar-types"; import {ValidatorResponse} from "../../../types/validator"; import {EpochContext} from "@chainsafe/lodestar-...
<<<<<<< LIGHTCLIENT_PATCH_FORK_SLOT: "99999999999", HF1_INACTIVITY_PENALTY_QUOTIENT: 50331648, HF1_MIN_SLASHING_PENALTY_QUOTIENT: 64, HF1_PROPORTIONAL_SLASHING_MULTIPLIER: 2, ======= LIGHTCLIENT_PATCH_FORK_SLOT: "0xffffffffffffffff", >>>>>>> HF1_INACTIVITY_PENALTY_QUOTIENT: 50331648, HF1_MIN_SLASHING_P...
<<<<<<< import {isDirectory} from "./util"; import {basename, join} from "path"; ======= import {isDirectory, objectToCamelCase} from "./util"; import {basename, parse, join} from "path"; import {describe, it} from "mocha"; >>>>>>> import {isDirectory, objectToCamelCase} from "./util"; import {basename, parse, join}...
<<<<<<< import * as mediaTypeParser from 'media-type'; import { HandleFunction } from 'connect'; ======= >>>>>>> import * as mediaTypeParser from 'media-type';
<<<<<<< export * from "./subscriptions"; export * from "./security"; ======= export * from "./subscriptions"; export * from "./sites"; export * from "./insights"; >>>>>>> export * from "./subscriptions"; export * from "./security"; export * from "./sites"; export * from "./insights";
<<<<<<< import { ISecurityMethods, Security } from "./security"; ======= import { ISitesMethods, Sites } from "./sites"; >>>>>>> import { ISecurityMethods, Security } from "./security"; import { ISitesMethods, Sites } from "./sites"; <<<<<<< public get security(): ISecurityMethods { return new Security...
<<<<<<< import { stringIsNullOrEmpty } from "@pnp/common"; ======= import getValidUser from "./utilities/getValidUser"; >>>>>>> import { stringIsNullOrEmpty } from "@pnp/common"; import getValidUser from "./utilities/getValidUser";
<<<<<<< import { User as IUser, Message as IMessage, } from "@microsoft/microsoft-graph-types"; import { Messages, MailboxSettings, MailFolders } from "./messages"; ======= import { DirectoryObjects } from "./directoryobjects"; import { User as IUser } from "@microsoft/microsoft-graph-types"; >>>>>>> import ...
<<<<<<< public async handleIntent(requestedIntent: intent, ...args: any[]) { const [currentState, contextStates] = await Promise.all([this.getCurrentState(), this.getContextStates()]); const intentMethod = this.deriveIntentMethod(requestedIntent); ======= public async handleIntent(requestedIntent: intent,...
<<<<<<< import { OptionalExtractions, MinimalRequestExtraction } from "../unifier/public-interfaces"; ======= >>>>>>> import { OptionalExtractions, MinimalRequestExtraction } from "../unifier/public-interfaces"; <<<<<<< @inject("core:root:current-logger") public logger: Logger, @inject("core:i18n:interpolat...
<<<<<<< import { MissingInterpolationExtension } from "../../../src/assistant-source"; import { injectable } from "inversify"; import { Container } from "inversify-components"; import { I18nextWrapper } from "../../../src/components/i18n/wrapper"; import { componentInterfaces } from "../../../src/components/i18n/compon...
<<<<<<< import { OptionalExtractions, MinimalRequestExtraction } from "../unifier/public-interfaces"; ======= >>>>>>> <<<<<<< import { featureIsAvailable } from "../unifier/feature-checker"; ======= import { featureIsAvailable } from "../unifier/feature-checker"; import { MinimalRequestExtraction, OptionalExtract...
<<<<<<< booleanLiteral, FlowType, FunctionDeclaration, FunctionTypeAnnotation, FunctionTypeParam, GenericTypeAnnotation, Identifier, identifier, IntersectionTypeAnnotation, isEmptyTypeAnnotation, isExistsTypeAnnotation, isFlowType, isFunctionDeclaration, isIdentifier, isNumberLiteralTypeAn...
<<<<<<< UnionTypeAnnotation, isQualifiedTypeIdentifier, tsQualifiedName, TSEntityName, TSQualifiedName ======= UnionTypeAnnotation, TupleTypeAnnotation, FunctionTypeAnnotation, restElement >>>>>>> UnionTypeAnnotation, isQualifiedTypeIdentifier, tsQualifiedName, TSE...
<<<<<<< // tslint:disable:no-any import { ClassMethod, ClassDeclaration } from '@babel/types'; import { NodePath } from '@babel/traverse'; import { convertClassConstructor } from '../converters/convert_class_constructor'; import { convertFlowType } from '../converters/convert_flow_type'; ======= // tslint:disable:no-...
<<<<<<< expect(() => tokenize('Hi {{')).toThrow( new SyntaxError('Missing }} in the template expression Hi {{') ======= expect(() => tokenize('Hi {{')).to.throw( SyntaxError, 'Missing "}}" in the template expression Hi {{' >>>>>>> expect(() => tokenize('Hi {{')).toThrow( new Synta...
<<<<<<< <title>WeTTy - The Web Terminal Emulator</title> <link rel="stylesheet" href="${resourcePath}public/index.css" /> ======= <title>${title}</title> <link rel="stylesheet" href="${basePath}/public/index.css" /> >>>>>>> <title>${title}</title> <link rel="stylesheet" href="${resourcePath}p...
<<<<<<< constructor(private $http, private $routeParams, private $location, private backendSrv, navModelSrv) { this.navModel = navModelSrv.getNav('cfg', 'admin', 'styleguide'); ======= constructor(private $http, private $routeParams, private backendSrv, navModelSrv) { this.navModel = navModelSrv.getAdminN...
<<<<<<< import {queryPartEditorDirective} from './components/query_part/query_part_editor'; ======= import {WizardFlow} from './components/wizard/wizard'; >>>>>>> import {queryPartEditorDirective} from './components/query_part/query_part_editor'; import {WizardFlow} from './components/wizard/wizard'; <<<<<<< quer...
<<<<<<< it('should caclculate the correct period', function () { var hourSec = 60 * 60; var daySec = hourSec * 24; var start = 1483196400; var testData: any[] = [ [{ period: 60 }, { namespace: 'AWS/EC2' }, {}, start, start + 3600, (hourSec * 3), 60], [{ period: null }, { namespace: 'AWS/E...
<<<<<<< withCredentials: boolean; ======= meta?: PluginMeta; pluginExports?: PluginExports; init?: () => void; testDatasource?: () => Promise<any>; >>>>>>> withCredentials: boolean; meta?: PluginMeta; pluginExports?: PluginExports; init?: () => void; testDatasource?: () => Promise<any>;
<<<<<<< import NewDataSourcePage from '../features/datasources/NewDataSourcePage'; ======= import UsersListPage from 'app/features/users/UsersListPage'; >>>>>>> import NewDataSourcePage from '../features/datasources/NewDataSourcePage'; import UsersListPage from 'app/features/users/UsersListPage';
<<<<<<< constructor(private $scope, private backendSrv, private navModelSrv) { this.navModel = navModelSrv.getNav('cfg', 'admin', 'global-users'); ======= constructor(private $scope, private backendSrv, navModelSrv) { this.navModel = navModelSrv.getAdminNav(); >>>>>>> constructor(private $scope, privat...
<<<<<<< <ng-container *ngIf="error"> <div class="form-alert form-alert-error" [innerHTML]="error?.displayMessage"></div> ======= <ng-container *ngIf="show"> <div [class.form-bubble]="bubble"> <div class="form-alert form-alert-error" [class.closeable]="closeable"...
<<<<<<< function typeaheadMatcher(item) { let str = this.query; ======= function typeaheadMatcher(this: any, item) { var str = this.query; >>>>>>> function typeaheadMatcher(this: any, item) { let str = this.query;
<<<<<<< import { AngularLoader, setAngularLoader } from 'app/core/services/angular_loader'; ======= import { configureStore } from 'app/stores/configureStore'; >>>>>>> import { AngularLoader, setAngularLoader } from 'app/core/services/angular_loader'; import { configureStore } from 'app/stores/configureStore'; <<<<...
<<<<<<< newItem: types.maybe(NewPermissionsItem), isAddPermissionsVisible: types.optional(types.boolean, false), ======= isInRoot: types.maybe(types.boolean), >>>>>>> newItem: types.maybe(NewPermissionsItem), isAddPermissionsVisible: types.optional(types.boolean, false), isInRoot: types.maybe...
<<<<<<< import { RawTimeRange, TimeRange, DataQuery, DataSourceSelectItem, DataSourceApi } from '@grafana/ui/src/types'; ======= import { RawTimeRange, TimeRange, DataQuery, DataSourceSelectItem } from '@grafana/ui/src/types'; >>>>>>> import { RawTimeRange, TimeRange, DataQuery, DataSourceSelectItem, DataSourceApi ...
<<<<<<< } declare module 'gridstack' { var gridstack: any; export default gridstack; ======= } declare module 'gemini-scrollbar' { var d3: any; export default d3; >>>>>>> } declare module 'gridstack' { var gridstack: any; export default gridstack; } declare module 'gemini-scrollbar' { var d3: any; ...
<<<<<<< configureStore(); ======= // sets singleston instances for angular services so react components can access them setBackendSrv(backendSrv); >>>>>>> // sets singleston instances for angular services so react components can access them configureStore(); setBackendSrv(backendSrv);
<<<<<<< const raw = { from: moment.utc('2018-04-25 10:00'), to: moment.utc('2018-04-25 11:00'), }; const ctx = <any>{ ======= const ctx = { >>>>>>> const raw = { from: moment.utc('2018-04-25 10:00'), to: moment.utc('2018-04-25 11:00'), }; const ctx = { <<<<<<< timeSrvMock: { ...
<<<<<<< import {userPicker} from './components/user_picker'; import {userGroupPicker} from './components/user_group_picker'; import {geminiScrollbar} from './components/scroll/scroll'; import {gfPageDirective} from './components/gf_page'; import {orgSwitcher} from './components/org_switcher'; ======= >>>>>>> impor...
<<<<<<< const parameters = _.map( this.params, function(value, index) { let paramType; if (index < this.def.params.length) { paramType = this.def.params[index].type; } else if (_.get(_.last(this.def.params), 'multiple')) { paramType = _.get(_.last(this.def.par...
<<<<<<< import FolderSettingsPage from 'app/features/manage-dashboards/FolderSettingsPage'; import TeamPages from 'app/features/teams/TeamPages'; import TeamList from 'app/features/teams/TeamList'; ======= import TeamPages from 'app/features/teams/TeamPages'; import TeamList from 'app/features/teams/TeamList'; import...
<<<<<<< constructor($scope, private $location, private $timeout) { var self = this; ======= constructor($scope, private $location, private $timeout, private $rootScope) { const self = this; >>>>>>> constructor($scope, private $location, private $timeout) { const self = this; <<<<<<< ======= ...
<<<<<<< addEditorTab(title, directiveFn, index?, icon?) { var editorTab = { title, directiveFn, icon }; ======= addEditorTab(title, directiveFn, index?) { const editorTab = { title, directiveFn }; >>>>>>> addEditorTab(title, directiveFn, index?, icon?) { const editorTab = { title, directiveFn, icon...
<<<<<<< this.clone.panels.forEach(panel => { delete panel.thresholds; delete panel.alert; ======= this.clone.rows.forEach(row => { row.panels.forEach(panel => { if (panel.type === "graph" && panel.alert) { delete panel.thresholds; } delete...
<<<<<<< export { CustomScrollbar } from './CustomScrollbar/CustomScrollbar'; // Select export { Select, AsyncSelect, SelectOptionItem } from './Select/Select'; export { IndicatorsContainer } from './Select/IndicatorsContainer'; export { NoOptionsMessage } from './Select/NoOptionsMessage'; export { default as resetSele...
<<<<<<< import * as pieChartPanel from 'app/plugins/panel/piechart/module'; ======= import * as barGaugePanel from 'app/plugins/panel/bargauge/module'; >>>>>>> import * as pieChartPanel from 'app/plugins/panel/piechart/module'; import * as barGaugePanel from 'app/plugins/panel/bargauge/module'; <<<<<<< 'app/plugi...
<<<<<<< /** @ngInject **/ constructor($scope, $injector, private templateSrv, private $q, private uiSegmentSrv) { ======= /** @ngInject */ constructor($scope, $injector) { >>>>>>> /** @ngInject */ constructor($scope, $injector, private templateSrv, private $q, private uiSegmentSrv) {
<<<<<<< ======= coreModule.directive('panelDropZone', function($timeout) { return function(scope, element) { var row = scope.ctrl.row; var indrag = false; var textEl = element.find('.panel-drop-zone-text'); function showPanel(span, text) { element.find('.panel-container').css('height', row....
<<<<<<< let quotedValues = _.map(value, v => { return this.queryModel.quoteLiteral(v); ======= const quotedValues = _.map(value, function(val) { return "'" + val.replace(/'/g, `''`) + "'"; >>>>>>> const quotedValues = _.map(value, v => { return this.queryModel.quoteLiteral(v); <<<<<<< ...
<<<<<<< // make angular loader service available to react components setAngularLoader(angularLoader); // create store with env services ======= // sets singleston instances for angular services so react components can access them setBackendSrv(backendSrv); >>>>>>> // make angular loader servi...
<<<<<<< this.isNew = true; this.current = angular.copy(defaults); ======= this.current = _.cloneDeep(defaults); >>>>>>> this.isNew = true; this.current = _.cloneDeep(defaults);
<<<<<<< export var classCounter = new Metrics.Counter(true); ======= declare var JARStore; >>>>>>> export var classCounter = new Metrics.Counter(true); declare var JARStore; <<<<<<< /** * Used to test loading of all class files. */ loadAllClassFiles() { var jarFiles = this.jarFiles; ...
<<<<<<< for (var i = 0; i < this.methodInfo.codeAttribute.max_stack; i++) { stack.push(this.getStack(i)); ======= for (var i = 0; i < this.methodInfo.max_stack; i++) { stack.push(this.getStackName(i)); >>>>>>> for (var i = 0; i < this.methodInfo.codeAttribute.max_stack; i++) { ...
<<<<<<< "java/lang/Class": { fields: { instanceSymbols: { "status.I": "status" } }, methods: { instanceSymbols: { "initialize.()V": "initialize" } } }, "java/lang/String": { ======= "java/lang/Thread": { >>>>>>> "java/lan...
<<<<<<< if (pc >= 0) { this.pc = pc; this.sp = this.fp + FrameLayout.CallerSaveSize; release || assert(e instanceof Object && "_address" in e, "exception is object with address"); ref[this.sp++] = e._address; return; } ...
<<<<<<< addr = gcMallocAtomic(Constants.ARRAY_HDR_SIZE + size * (<PrimitiveArrayClassInfo>arrayClassInfo).bytesPerElement); // Zero-out memory because GC_MALLOC_ATOMIC doesn't do it automatically. var off = Constants.ARRAY_HDR_SIZE + addr; var end = off + size * (<PrimitiveArrayClassInfo>arrayC...
<<<<<<< import { ApiUrlConfig, MathHelper, UserDto, UsersProviderService } from '@app/shared/internal'; ======= import { ApiUrlConfig, MathHelper } from 'framework'; import { PublicUserDto, UsersProviderService } from './../declarations-base'; >>>>>>> import { ApiUrlConfig, MathHelper, P...
<<<<<<< B(pc: number, nextPC: number, local: any [], stack: any [], lockObject: java.lang.Object) { var methodInfo = jitMethodInfos[(<any>arguments.callee.caller).name]; release || assert(methodInfo !== undefined, "methodInfo undefined in B"); $.ctx.bailout(methodInfo, pc, nextPC, local, stack, lo...
<<<<<<< var thread = <java.lang.Thread>getHandle($.mainThread); getLinkedMethod(methodInfo).call(thread, J2ME.newString("main")); if (U) { $.nativeBailout(J2ME.Kind.Void, J2ME.Bytecode.Bytecodes.INVOKESPECIAL); } ======= getLinkedMethod(methodInfo)($.mainThread, J2ME.newString("main")); >>>...
<<<<<<< Native["org/mozilla/internal/Sys.getIsolateMain.()Ljava/lang/String;"] = function(addr: number): java.lang.String { ======= Native["org/mozilla/internal/Sys.getIsolateMain.()Ljava/lang/String;"] = function(): number { >>>>>>> Native["org/mozilla/internal/Sys.getIsolateMain.()Ljava/lang/String;"] = func...
<<<<<<< ======= writer.writeLn(" " + prefix.padRight(' ', 5) + " " + toNumber(i - this.fp).padLeft(' ', 3) + " " + String(i).padLeft(' ', 4) + " " + toHEX(i << 2) + ": " + String(i32[i]).padLeft(' ', 12) + " " + toHEX(i32[i]) + " " + ((i32[i] >= 32 && i32[i] < 1024) ? String.fro...
<<<<<<< this.emitNullPointerCheck(objectAddr); var addr = objectAddr + "+" + fieldInfo.byteOffset; this.emitPush(kind, "i32[" + addr + ">>2]", Precedence.Member); ======= if (!isStatic) { this.emitNullPointerCheck(objectAddr); } var address = objectAddr + "+" + fieldInfo.by...
<<<<<<< /** * Returns true if the language is supported. */ export const isSupportedLanguage = (language: string, supportedLanguages: RefractorSyntax[]) => { return getLanguageNamesAndAliases(supportedLanguages).includes(language); }; interface GetLanguageParameter { ======= interface GetLanguageParams { >>>>>>...
<<<<<<< steps.map((item) => Step.fromJSON(schema(), item.step)), steps.map((item) => item.clientID), ======= steps.map(item => Step.fromJSON(schema, item)), steps.map(item => item.clientID), >>>>>>> steps.map((item) => Step.fromJSON(schema(), item...
<<<<<<< import {SingleFocusDispatcher} from "../services/formly.single.focus.dispatcher"; ======= import {FORM_DIRECTIVES, REACTIVE_FORM_DIRECTIVES} from "@angular/forms"; >>>>>>> import {FORM_DIRECTIVES, REACTIVE_FORM_DIRECTIVES} from "@angular/forms"; import {SingleFocusDispatcher} from "../services/formly.single...
<<<<<<< import {SingleFocusDispatcher} from "../services/formly.single.focus.dispatcher"; ======= import {FORM_DIRECTIVES, REACTIVE_FORM_DIRECTIVES} from "@angular/forms"; >>>>>>> import {FORM_DIRECTIVES, REACTIVE_FORM_DIRECTIVES} from "@angular/forms"; import {SingleFocusDispatcher} from "../services/formly.single...
<<<<<<< }, "tsconfig with extends and nostrictnull works as expected": function (test) { test.expect(4); var cfg = getConfig("minimalist"); cfg.tsconfig = { tsconfig: './test/tsconfig_artifact/extends/tsconfig.nostrictnull.json', }; var result = or.resolveAsync(null, cfg).t...
<<<<<<< { name: 'buildkite', fileNames: ['buildkite.yml', 'buildkite.yaml'] }, { name: 'uml', // https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml#user-content-supported-formats fileExtensions: ['iuml', 'pu', 'puml', 'plantuml', 'wsd'], li...
<<<<<<< export interface DependentQuery<DQ> { (accessor: FieldAccessor<any, any>): DQ; } export interface ReferenceOptions<SQ, DQ> { source: Source<SQ & DQ>; dependentQuery?: DependentQuery<DQ>; autoLoad?: boolean; } export interface FieldOptions<R, V, SQ, DQ> { ======= export type ConversionErrors = { de...
<<<<<<< uin: '', ======= uin: this.emitter.getUIN(), data: JSON.stringify({loginer: '1'}), >>>>>>> uin: this.emitter.getUIN(),
<<<<<<< log.silly(PRE, `messageid and messagetype : ${util.inspect(messageId)};${messageType}`) ======= >>>>>>>
<<<<<<< { name: 'tiltfile', fileNames: ['Tiltfile'] }, ======= { name: 'capacitor', fileNames: ['capacitor.config.json'] }, { name: 'sketch', fileExtensions: ['sketch'] }, { name: 'adonis', fileNames: ['.adonisrc.json'] }, { name: 'uml', fileExtensions: ...
<<<<<<< import { GrpcGateway } from '../server-manager/grpc-gateway' import { StreamResponse, ResponseType } from '../server-manager/proto-ts/PadPlusServer_pb' import { ScanStatus, UrlLinkPayload } from 'wechaty-puppet' import { RequestClient } from './api-request/request' import PadplusUser from './api-request/user' i...
<<<<<<< ======= import { PluginListenerHandle } from '@capacitor/core'; >>>>>>> import { PluginListenerHandle } from '@capacitor/core'; <<<<<<< ======= // AdMob listeners addListener(eventName: 'onAdLoaded', listenerFunc: (info: any) => void): PluginListenerHandle; addListener(eventName: 'onAdFailedToL...
<<<<<<< babelParserPlugins?: BabelParserPlugins, jsFile?: boolean ): object { ======= babelParserPlugins?: BabelParserPlugins ): AstResult { >>>>>>> babelParserPlugins?: BabelParserPlugins, jsFile?: boolean ): AstResult { <<<<<<< }) test('data in a mixin', () => { const sfc: AstResult = getAST('common....
<<<<<<< jsFile?: any ======= includeSyncEvent?: boolean >>>>>>> jsFile?: any includeSyncEvent?: boolean
<<<<<<< { name: 'scheme', fileExtensions: ['ss', 'scm'] } ======= { name: 'tailwindcss', fileNames: ['tailwind.js', 'tailwind.config.js'] }, >>>>>>> { name: 'scheme', fileExtensions: ['ss', 'scm'] }, { name: 'tailwindcss', fileNames: ['tailwind.js', 'tailwind.config.js'] },
<<<<<<< { name: 'uml', fileExtensions: ['iuml', 'pu', 'puml', 'plantuml', 'wsd'], light: true, }, ======= { name: 'codeowners', fileNames: ['codeowners'] }, { name: 'gcp', fileNames: ['.gcloudignore'] }, >>>>>>> { name: 'codeowners', fileNames: ['...
<<<<<<< { name: 'uml', fileExtensions: ['iuml', 'pu', 'puml', 'plantuml', 'wsd'], light: true, }, ======= { name: 'gitpod', fileNames: ['.gitpod.yml'] }, >>>>>>> { name: 'gitpod', fileNames: ['.gitpod.yml'] }, { name: 'uml', fi...
<<<<<<< import {copyingSlice, deprecationMessage, bufferValidator} from '../core/util'; ======= import {copyingSlice} from '../core/util'; >>>>>>> import {copyingSlice, bufferValidator} from '../core/util'; <<<<<<< deprecationMessage(deprecateMsg, IsoFS.Name, {data: "ISO data as a Buffer", name: name}); ======...
<<<<<<< import * as BrowserFS from '../../src/core/browserfs'; import {FileSystem} from '../../src/core/file_system'; import * as buffer from 'buffer'; import BackendFactory from './BackendFactory'; import {eachSeries as asyncEachSeries} from 'async'; ======= import BrowserFS = require('../../src/core/browserfs'); im...
<<<<<<< import { Model, Token2Vec } from '../../typings' import { enrichToken2Vec, getSentenceFeatures } from '../language/ft_featurizer' ======= import { getProgressPayload, identityProgress } from '../../tools/progress' import { Model } from '../../typings' import { getSentenceFeatures } from '../language/ft_featur...
<<<<<<< import { CMS } from './cms/cms' import { ContentElementSender } from './cms/content-sender' import { ConverseService } from './converse' ======= import { CMSService } from './cms/cms-service' >>>>>>> import { CMS } from './cms/cms' import { ConverseService } from './converse'
<<<<<<< for (let i = 0; i < utterance.tokens.length; i++) { const results = _.orderBy( candidates.filter(x => !x.eliminated && x.start <= i && x.end >= i), // we want to favor longer matches (but is obviously less important than score) // so we take its length into account (up to the l...
<<<<<<< BotService.setBotStatus(botId, 'error') this.logger .attachError(err) .error(`Cannot mount bot "${botId}". Make sure it exists on the filesystem or the database.`) return false } finally { await this._updateBotHealthDebounce() ======= this.logger.attachError(...
<<<<<<< defaultLanguage: string languages: string[] ======= locked: boolean pipeline_status: BotPipelineStatus } export type Pipeline = Stage[] export type StageAction = 'promote_copy' | 'promote_move' export interface Stage { id: string label: string action: StageAction } ...
<<<<<<< updateIntent: (intent: NLU.IntentDefinition) => bp.axios.put(`/mod/nlu/intents/${intent.name}`, intent), deleteIntent: (name: string) => bp.axios.delete(`/mod/nlu/intents/${name}`), ======= updateIntent: () => {}, // TODO use /intent/:id/utterances and use it in intent editor deleteIntent: (name: stri...
<<<<<<< const isProduction = !yn(process.env.DEBUG) && (isPackaged || process.env.NODE_ENV == 'production') const botpressEdition = process.env.EDITION || 'community' const projectLocation = isPackaged ? path.join(path.dirname(process.execPath)) // We point at the binary path : path.join(__dirname, '..') // e.g. /...
<<<<<<< { name: 'folder-mobile', folderNames: ['mobile', 'mobiles', 'portable', 'portability'] }, ======= { name: 'folder-mobile', folderNames: ['mobile', 'mobiles', 'portable'] }, { name: 'folder-stencil', folderNames: ['.stencil'] }, { name: 'folder-firebase', folderN...
<<<<<<< import { Predictor, Trainer as SVMTrainer } from './svm' ======= import { processor } from './sentencepiece' >>>>>>> import { processor } from './sentencepiece' import { Predictor, Trainer as SVMTrainer } from './svm'
<<<<<<< import { WellKnownFlags } from 'core/sdk/enums' ======= >>>>>>>
<<<<<<< import fse from 'fs-extra' import _, { debounce, sumBy } from 'lodash' ======= import * as sdk from 'botpress/sdk' >>>>>>> import * as sdk from 'botpress/sdk' import fse from 'fs-extra' import _, { debounce, sumBy } from 'lodash' <<<<<<< import { setSimilarity, vocabNGram } from './tools/strings' import { L...
<<<<<<< if (slotDef && !entity) { return } const value = _.get(entity, 'data.value', token.value) // entity can be null if slot type = any const confidence = _.get(entity, 'meta.confidence', -1) ======= const value = _.get(entity, 'data.value', token.value) const source = _.get(entity, ...
<<<<<<< import { KeyValueStore } from './services/kvs/kvs' ======= import { ScopedGhostService } from './services/ghost/service' >>>>>>> import { ScopedGhostService } from './services/ghost/service' import { KeyValueStore } from './services/kvs/kvs' <<<<<<< @inject(TYPES.KeyValueStore) keyValueStore: KeyValueSt...
<<<<<<< import cluster from 'cluster' import { Botpress, Config, Logger } from 'core/app' ======= import { Botpress, Config, Db, Ghost, Logger } from 'core/app' >>>>>>> import cluster from 'cluster' import { Botpress, Config, Db, Ghost, Logger } from 'core/app' <<<<<<< if (cluster.isMaster) { // The master pr...
<<<<<<< isAllowed = botId ? writePermissions.botActions : writePermissions.globalActions } else if (type === 'bot_config') { isAllowed = writePermissions.botConfigs } else if (type === 'global_config' || type === 'module_config') { isAllowed = writePermissions.globalConfigs ======= ret...
<<<<<<< import ms from 'ms' ======= import moment from 'moment' >>>>>>> import moment from 'moment' import ms from 'ms' <<<<<<< this.router.get( '/notifications', this.checkTokenHeader, this.needPermissions('read', 'bot.notifications'), async (req, res) => { const botId = req.par...
<<<<<<< private _extractEntities = async (ds: NLUStructure): Promise<NLUStructure> => { ======= public get modelHash() { return this._currentModelHash } public computeModelHash(intents: sdk.NLU.IntentDefinition[]) { return crypto .createHash('md5') .update(JSON.stringify(intents)) ....
<<<<<<< /** * Overrides the auto-computed `process.APP_DATA_PATH` path * @see Process.APP_DATA_PATH */ readonly APP_DATA_PATH?: string ======= /** * Truthy if running the official Botpress docker image */ readonly BP_IS_DOCKER?: boolean >>>>>>> /** * Overrides the auto-computed `proces...