@google-cloud/kcmd 0.1.0 → 0.2.1

package/build/ts/kcmd/semantic/ir.d.ts

@@ -33,10 +33,8 @@ export interface CustomExtension {
  * (edges), with model-level metrics defined over them.
  *
  * The IR is primarily semantics. The loader reads a model's named
- * `deployments:` list onto `deployments`. In the Google flavor it also folds
- * their target URIs into a model-level GOOGLE `custom_extensions` block for the
- * consumers that read it. A vanilla model lists its deployments in its GOOGLE
- * block, which the loader reads and does not fold.
+ * `deployments:` list onto `deployments` (from `deployments:` in the Google
+ * flavor or from the model-level GOOGLE `custom_extensions` block in vanilla).
  */
 export interface SemanticModel {
     name: string;

package/build/ts/kcmd/semantic/kc_converter.d.ts

@@ -6,6 +6,11 @@ export interface ReadResult {
     warnings: string[];
     secondGeneration?: boolean;
     overviews?: Map<string, OverviewSidecar>;
+    firstGeneration?: FirstGenerationModel[];
+}
+export interface FirstGenerationModel {
+    name: string;
+    entries: Entry[];
 }
 /**
  * Reconstructs the Semantic Model IR from Knowledge Catalog entries.
@@ -22,7 +27,8 @@ export interface ReadResult {
  *
  * With `opts.v2Aspects` set, a model whose `semantic-model` aspect has
  * `specVersion` is rebuilt from the second-generation types (see
- * readModelV2), which reads no entry link.
+ * readModelV2), which reads no entry link. A model without it is returned in
+ * `firstGeneration` instead of being rebuilt.
  */
 export declare function modelsFromCatalogResources(entries: Entry[], entryLinks?: EntryLink[], opts?: {
     v2Aspects?: boolean;

package/build/ts/kcmd/semantic/kc_converter.js

@@ -31,9 +31,8 @@
 // `guidelines` aspect, on the model/entity/metric), each metric's attach entity
 // (re-derived from its expression, as the loader does, when the catalog holds
 // one, else the value the emitter persisted), the model's deployment targets
-// (from the semantic-model aspect, back into `deployments` and the GOOGLE
-// `custom_extensions` block), and 1:1 / 1:N relationships (from the
-// `schema-join` entry links a pull fetched -- see
+// (from the semantic-model aspect, back into `deployments`), and 1:1 / 1:N
+// relationships (from the `schema-join` entry links a pull fetched -- see
 // `modelsFromCatalogResources`'s `entryLinks` argument).
 // The per-field `semantics` block -- field/metric expressions and the DIMENSION
 // role
@@ -102,7 +101,8 @@ function warnDanglingGuards(actions, constraints, modelName, warnings) {
  *
  * With `opts.v2Aspects` set, a model whose `semantic-model` aspect has
  * `specVersion` is rebuilt from the second-generation types (see
- * readModelV2), which reads no entry link.
+ * readModelV2), which reads no entry link. A model without it is returned in
+ * `firstGeneration` instead of being rebuilt.
  */
 function modelsFromCatalogResources(entries, entryLinks = [], opts = {}) {
     const warnings = [];
@@ -128,11 +128,24 @@ function modelsFromCatalogResources(entries, entryLinks = [], opts = {}) {
         (soleAnchor === anchorName && !anchorNames.has(e.parentEntry ?? '')));
     let secondGeneration = false;
     const overviews = new Map();
-    const models = anchors.map(anchor => {
-        const name = anchor.entrySource?.displayName ?? idOf(anchor.name);
+    const nameOf = (anchor) => anchor.entrySource?.displayName ?? idOf(anchor.name);
+    // With the second-generation types, a model whose model entry has no
+    // specVersion was pushed with the first-generation types. It is left out
+    // rather than rebuilt from them.
+    const isFirstGeneration = (anchor) => !!opts.v2Aspects &&
+        aspectData(anchor, 'semantic-model').specVersion === undefined;
+    const firstGeneration = anchors.filter(isFirstGeneration).map(anchor => ({
+        name: nameOf(anchor),
+        entries: [
+            anchor,
+            ...[entityEntries, metricEntries, actionEntries, constraintEntries]
+                .flatMap(pool => childrenOf(anchor.name, pool)),
+        ],
+    }));
+    const models = anchors.filter(a => !isFirstGeneration(a)).map(anchor => {
+        const name = nameOf(anchor);
         const children = (pool) => childrenOf(anchor.name, pool);
-        if (opts.v2Aspects &&
-            aspectData(anchor, 'semantic-model').specVersion !== undefined) {
+        if (opts.v2Aspects) {
             secondGeneration = true;
             const [entities, metrics, relationships] = [entityEntries, metricEntries, relationshipEntries].map(children);
             overviewSidecars([anchor, ...entities, ...metrics, ...relationships])
@@ -162,13 +175,11 @@ function modelsFromCatalogResources(entries, entryLinks = [], opts = {}) {
         if (description !== undefined)
             model.description = description;
         readActionsAndConstraints(model, children(actionEntries), children(constraintEntries), warnings);
-        // Deployment targets ride back in both the GOOGLE custom_extensions block
-        // and as synthesized `deployments` entries (`default` when one,
-        // `deployment_1`, `deployment_2`, ... when several).
-        const targets = readDeploymentTargets(anchor, name, warnings);
-        if (targets) {
-            model.customExtensions = [targets.extension];
-            model.deployments = targets.deployments;
+        // Deployment targets ride back as synthesized `deployments` entries
+        // (`default` when one, `deployment_1`, `deployment_2`, ... when several).
+        const deployments = readDeploymentTargets(anchor, name, warnings);
+        if (deployments) {
+            model.deployments = deployments;
         }
         const ai = readAiContext(anchor);
         if (ai)
@@ -189,6 +200,7 @@ function modelsFromCatalogResources(entries, entryLinks = [], opts = {}) {
         models,
         warnings: [...new Set(warnings)],
         ...(secondGeneration ? { secondGeneration, overviews } : {}),
+        ...(firstGeneration.length ? { firstGeneration } : {}),
     };
 }
 // Reads a model's action and constraint entries onto `model`.
@@ -664,10 +676,10 @@ function aspectDataOf(aspects, type, path = '') {
     return {};
 }
 // Recovers the model's deployment targets from its semantic-model aspect back
-// into both the GOOGLE custom_extension shim and a `deployments` list (`default`
-// when there is one target, `deployment_1`, `deployment_2`, ... when there are
-// several), warning that the original deployment names were not recovered.
-// Returns undefined when the model has none.
+// into a `deployments` list (`default` when there is one target,
+// `deployment_1`, `deployment_2`, ... when there are several), warning that the
+// original deployment names were not recovered. Returns undefined when the
+// model has none.
 function readDeploymentTargets(anchor, modelName, warnings) {
     const deployments = (0, deployment_target_1.unnamedDeployments)(asArray(aspectData(anchor, 'semantic-model').deploymentTargets)
         .filter((t) => typeof t === 'string'));
@@ -680,16 +692,9 @@ function readDeploymentTargets(anchor, modelName, warnings) {
         if (problem !== undefined)
             warnings.push(problem);
     }
-    const targets = deployments.map(d => d.target);
     warnings.push(`model '${modelName}': deployment names were not recovered (the ` +
         `catalog stores target URIs only); using ${deployments.map(d => `'${d.name}'`).join(', ')}`);
-    return {
-        extension: {
-            vendorName: 'GOOGLE',
-            data: JSON.stringify({ deploymentTargets: targets }),
-        },
-        deployments,
-    };
+    return deployments;
 }
 // Inverts schemaJoinAspectData (knowledge_catalog.ts): each schema-join link
 // whose two endpoints are both this model's entity entries becomes one

package/build/ts/kcmd/semantic/kc_custom_types.d.ts

@@ -4,21 +4,15 @@ export interface CustomType {
     id: string;
     entryType: Omit<EntryType, 'name' | 'requiredAspects'>;
     aspectType: Omit<AspectType, 'name'>;
-    required?: boolean;
 }
 export declare function aiContextField(index: number): Record<string, any>;
 export declare function aiContextAspectValue(ai: AiContext | undefined): Record<string, any> | undefined;
 export declare function aiContextFromAspect(value: any): AiContext | undefined;
 export declare const ACTION_TYPE_ID = "semantic-action";
 export declare const CONSTRAINT_TYPE_ID = "semantic-constraint";
-export declare const FILE_COPY_TYPE_ID = "semantic-model-file";
-export declare const PUSH_ID_LABEL = "kcmd-push-id";
-export interface FileCopy {
-    fileName: string;
-    content: string;
-    pushId?: string;
-    pushFileCount?: number;
-}
+export declare const PUSH_STATE_LABEL = "kcmd-push-state";
+export declare const PUSH_WRITING = "writing";
+export declare const PUSH_FINISHED = "finished";
 export declare const CUSTOM_TYPES: readonly CustomType[];
 export declare function isCustomType(id: string): boolean;
 /**
@@ -56,9 +50,8 @@ export interface ProvisionResult {
  * template lacks fails with an opaque parsing error. Dataplex rejects a
  * backwards-incompatible change, so the patch only ever adds appended fields.
  *
- * Stops at the first hard failure, which includes a permission refusal for a
- * required type that does not exist. A refusal to patch a type that exists is
- * a warning. A refusal for an optional type does NOT stop it: the refusals
+ * Stops at the first hard failure. A refusal to patch a type that exists is
+ * a warning. A refusal to create a type does NOT stop it: the refusals
  * differ per type and per operation -- patching a type that already exists
  * needs `update`, creating one that does not needs `create` -- so a caller
  * refused one type may well be allowed the next, and giving up early would

package/build/ts/kcmd/semantic/kc_custom_types.js

@@ -37,7 +37,7 @@
 // removing an existing field breaks the update for every project that already
 // provisioned the type.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CUSTOM_TYPES = exports.PUSH_ID_LABEL = exports.FILE_COPY_TYPE_ID = exports.CONSTRAINT_TYPE_ID = exports.ACTION_TYPE_ID = void 0;
+exports.CUSTOM_TYPES = exports.PUSH_FINISHED = exports.PUSH_WRITING = exports.PUSH_STATE_LABEL = exports.CONSTRAINT_TYPE_ID = exports.ACTION_TYPE_ID = void 0;
 exports.aiContextField = aiContextField;
 exports.aiContextAspectValue = aiContextAspectValue;
 exports.aiContextFromAspect = aiContextFromAspect;
@@ -549,67 +549,12 @@ const CONSTRAINT_ASPECT_TYPE = {
         ],
     },
 };
-// The id of the file-copy type. A file copy holds the text of one model or
-// profile file as push read it, so a pull can return the file unchanged.
-exports.FILE_COPY_TYPE_ID = 'semantic-model-file';
-// The entrySource label a push puts on the model entry when it stores file
-// copies. Its value is the push id those copies carry. A model entry whose
-// label names a push the catalog holds no copies of was last written by a
-// push that stopped before storing them. kcmd owns this label and no other.
-exports.PUSH_ID_LABEL = 'kcmd-push-id';
-// The aspect that carries a file copy.
-const FILE_COPY_ASPECT_TYPE = {
-    displayName: 'Semantic Model File',
-    description: 'The text of one semantic model file or profile file, exactly as ' +
-        'pushed.',
-    metadataTemplate: {
-        name: exports.FILE_COPY_TYPE_ID,
-        type: 'record',
-        recordFields: [
-            {
-                index: 1,
-                name: 'fileName',
-                type: 'string',
-                constraints: { required: true },
-                annotations: {
-                    displayName: 'File Name',
-                    description: 'The file\'s path relative to the entry group directory, for ' +
-                        'example `retail.profile.prod.yaml`.',
-                },
-            },
-            {
-                index: 2,
-                name: 'content',
-                type: 'string',
-                constraints: { required: true },
-                annotations: {
-                    displayName: 'Content',
-                    description: 'The file\'s text, exactly as read.',
-                },
-            },
-            {
-                index: 3,
-                name: 'pushId',
-                type: 'string',
-                annotations: {
-                    displayName: 'Push ID',
-                    description: 'The id of the push that stored this copy. Every copy one push ' +
-                        'stores carries the same id.',
-                },
-            },
-            {
-                index: 4,
-                name: 'pushFileCount',
-                type: 'int',
-                annotations: {
-                    displayName: 'Push File Count',
-                    description: 'How many file copies the push that stored this one ' +
-                        'stored in all.',
-                },
-            },
-        ],
-    },
-};
+// The entrySource label every push puts on the model entry: PUSH_WRITING with
+// the model entry's write and PUSH_FINISHED as the push's last write. kcmd
+// owns this label and no other.
+exports.PUSH_STATE_LABEL = 'kcmd-push-state';
+exports.PUSH_WRITING = 'writing';
+exports.PUSH_FINISHED = 'finished';
 // Every type kcmd provisions. This list is the whole of what is custom.
 exports.CUSTOM_TYPES = [
     {
@@ -628,16 +573,6 @@ exports.CUSTOM_TYPES = [
         },
         aspectType: CONSTRAINT_ASPECT_TYPE,
     },
-    {
-        id: exports.FILE_COPY_TYPE_ID,
-        entryType: {
-            displayName: 'Semantic Model File',
-            description: 'A copy of one semantic model file or profile file.',
-        },
-        aspectType: FILE_COPY_ASPECT_TYPE,
-        // Push stores every model file with it.
-        required: true,
-    },
 ];
 // Custom types are provisioned at `global` so an entry group in any region can
 // reference them, matching where the built-in system types live.
@@ -692,9 +627,8 @@ function customAspectKey(id, dest) {
  * template lacks fails with an opaque parsing error. Dataplex rejects a
  * backwards-incompatible change, so the patch only ever adds appended fields.
  *
- * Stops at the first hard failure, which includes a permission refusal for a
- * required type that does not exist. A refusal to patch a type that exists is
- * a warning. A refusal for an optional type does NOT stop it: the refusals
+ * Stops at the first hard failure. A refusal to patch a type that exists is
+ * a warning. A refusal to create a type does NOT stop it: the refusals
  * differ per type and per operation -- patching a type that already exists
  * needs `update`, creating one that does not needs `create` -- so a caller
  * refused one type may well be allowed the next, and giving up early would
@@ -724,62 +658,59 @@ async function provisionOne(cat, dest, type) {
     const home = customTypeHome(dest);
     // Creating a type needs permissions that publishing entries does not. A
     // caller who lacks them can still init, push and pull every model that uses
-    // none of the optional types, so that refusal is reported rather than fatal.
-    // A required type is needed by every push, so its refusal stops init.
+    // none of the custom types, so that refusal is reported rather than fatal.
     const denial = (what, status, message) => {
         if (status !== 403)
             return undefined;
-        const refused = `no permission to create ${what} in project '${home.project}' (${message || status})`;
-        return type.required ?
-            { error: `${refused}; every push needs it, so init cannot finish` } :
-            {
-                denied: `${refused}; models that need it cannot be pushed until ` +
-                    `it exists`
-            };
+        return {
+            denied: `no permission to create ${what} in project '${home.project}' (${message || status}); models that need it cannot be pushed ` +
+                `until it exists`
+        };
     };
-    // A caller without create permission may be refused the create of a type
-    // that already exists. For a required type a lookup tells the two apart, so
-    // init fails only when the type is missing.
-    const refusedButExists = async (status, lookup) => status === 403 && !!type.required && (await lookup()).status === 200;
     const warnings = [];
     const aspectLabel = `aspect type '${type.id}'`;
     const aspect = await cat.createAspectType(home.project, home.location, type.id, type.aspectType);
-    if (aspect.status === 409 ||
-        await refusedButExists(aspect.status, () => cat.getAspectType(home.project, home.location, type.id))) {
-        const upd = await cat.updateAspectType(home.project, home.location, type.id, type.aspectType, ['description', 'display_name', 'metadata_template']);
-        // Patching an existing type forward is best effort. Dataplex refuses a
-        // template change it judges backwards-incompatible -- removing a field, or
-        // renumbering one -- and the type already there is the one every published
-        // entry depends on. Leaving it alone and saying so beats aborting an init
-        // that has already created the entry group.
-        //
-        // What the warning has to carry is the way OUT, because there is no way
-        // forward: `kcmd` creates and patches aspect types and does not delete
-        // them, so a project holding a template this build cannot patch stays that
-        // way until someone removes it by hand. Naming the resource and the
-        // command is the whole of the fix; a reader who has only "left it
-        // unchanged" has to work out which of several types in which project, and
-        // then that `gcloud dataplex aspect-types` is where it lives.
+    if (aspect.status === 409) {
+        const upd = await cat.updateAspectType(home.project, home.location, type.id, type.aspectType, ['description', 'display_name', 'metadata_template'])
+            // A thrown error, such as a network failure, gets the retry warning.
+            .catch((err) => ({ status: 0, message: String(err?.message || err) }));
+        // Patching an existing type is best effort. Published entries depend on
+        // the type already there, so a failed patch leaves it and init goes on.
         const reason = upd.status !== 200 ?
             `${upd.message || upd.status}` :
-            await cat.awaitOperation(upd.result, `updating ${aspectLabel}`);
+            await cat.awaitOperation(upd.result, 'the update operation')
+                .catch((err) => String(err?.message || err));
         if (upd.status === 403) {
             // The type exists, so a refusal to patch it leaves it as it is.
             warnings.push(`no permission to update the existing ${aspectLabel} in project ` +
                 `'${home.project}' (${reason}); left it unchanged`);
         }
-        else if (reason) {
+        else if (reason &&
+            /Backwards incompatible template change/i.test(reason)) {
+            // Dataplex refuses a backwards-incompatible template change with this
+            // message, and the same template gets the same answer on every run.
+            // kcmd never deletes a type, so the warning names the gcloud commands
+            // that do.
             const resource = customAspectTypeName(type.id, dest);
             warnings.push(`left the existing ${aspectLabel} unchanged (${reason}). It is ` +
                 `${resource}, and Dataplex will not patch it into the template ` +
                 `this build states -- a template field that was removed or ` +
                 `renumbered is a backwards-incompatible change and is refused. A ` +
                 `push will fail wherever the two disagree. To move it forward, ` +
-                `delete it and re-run this command: gcloud dataplex aspect-types ` +
-                `delete ${type.id} --project=${home.project} ` +
-                `--location=${home.location}. Deleting takes the aspects of every ` +
-                `entry already published with this type, so re-push those models ` +
-                `afterwards.`);
+                `delete the entry type and then the aspect type, and re-run this ` +
+                `command: gcloud dataplex entry-types delete ${type.id} ` +
+                `--project=${home.project} --location=${home.location} && gcloud ` +
+                `dataplex aspect-types delete ${type.id} --project=${home.project} ` +
+                `--location=${home.location}. Deleting the entry type also deletes ` +
+                `every entry of that type in the project, so push the models that ` +
+                `had them again afterwards.`);
+        }
+        else if (reason) {
+            // Any other failure, such as a 429 from the write quota, a 5xx, a failed
+            // operation or a network error, can pass on a later run.
+            warnings.push(`could not update the existing ${aspectLabel} in project ` +
+                `'${home.project}' (${reason}). Run this command again in a minute ` +
+                `to retry the update.`);
         }
     }
     else if (aspect.status !== 200) {
@@ -808,10 +739,8 @@ async function provisionOne(cat, dest, type) {
         requiredAspects: [{ type: customAspectTypeName(type.id, dest) }],
     });
     const collected = warnings.length ? { warnings } : {};
-    if (entryType.status === 409 ||
-        await refusedButExists(entryType.status, () => cat.getEntryType(home.project, home.location, type.id))) {
+    if (entryType.status === 409)
         return collected;
-    }
     const refused = denial(entryLabel, entryType.status, entryType.message);
     if (refused)
         return { ...refused, ...collected };

package/build/ts/kcmd/semantic/kc_ids.d.ts

@@ -55,11 +55,6 @@ export declare class Namer {
      * branch on `v2Aspects`.
      */
     linkId(model: SemanticModel, rel: Relationship): string;
-    /**
-     * Bare entry ID for a verbatim model/profile file copy (used while
-     * `KC_V2_ASPECTS` is off). Dotted under both layouts.
-     */
-    fileEntryId(modelName: string, fileName: string): string;
 }
 /** Entry-link ID for a relationship on a model. */
 export declare function relationshipLinkId(modelName: string, relName: string): string;
@@ -78,6 +73,10 @@ export declare function semanticLinkId(kind: 'link' | 'relationship' | 'extends'
  * relationship entries. Because V2 model names are restricted to letters,
  * digits, underscores and hyphens, all of which `slug()` keeps,
  * `slug(modelName)` and `modelName` are equal for valid V2 models.
+ *
+ * No push writes under `.files.` any more: an older kcmd stored a copy of
+ * each model and profile file there. The prefix stays so the next push
+ * deletes those copies.
  */
 export declare function ownedEntryIdPrefixes(modelName: string): string[];
 /**

package/build/ts/kcmd/semantic/kc_ids.js

@@ -109,13 +109,6 @@ class Namer {
     linkId(model, rel) {
         return relationshipLinkId(model.name, rel.name);
     }
-    /**
-     * Bare entry ID for a verbatim model/profile file copy (used while
-     * `KC_V2_ASPECTS` is off). Dotted under both layouts.
-     */
-    fileEntryId(modelName, fileName) {
-        return `${slug(modelName)}.files.${slug(fileName)}`;
-    }
 }
 exports.Namer = Namer;
 /** Entry-link ID for a relationship on a model. */
@@ -140,6 +133,10 @@ function semanticLinkId(kind, ...parts) {
  * relationship entries. Because V2 model names are restricted to letters,
  * digits, underscores and hyphens, all of which `slug()` keeps,
  * `slug(modelName)` and `modelName` are equal for valid V2 models.
+ *
+ * No push writes under `.files.` any more: an older kcmd stored a copy of
+ * each model and profile file there. The prefix stays so the next push
+ * deletes those copies.
  */
 function ownedEntryIdPrefixes(modelName) {
     const s = slug(modelName);

package/build/ts/kcmd/semantic/knowledge_catalog.d.ts

@@ -1,7 +1,6 @@
 import type { Entry, EntryLink } from '../gcp/dataplex';
 import type { OverviewSidecar } from '../layouts/semantic-model';
 import { SemanticModel } from './ir';
-import { FileCopy } from './kc_custom_types';
 export interface KcGenerateOptions {
     project: string;
     location: string;
@@ -10,7 +9,6 @@ export interface KcGenerateOptions {
     systemTypeLocation?: string;
     emitExpressions?: boolean;
     v2Aspects?: boolean;
-    sourceFiles?: FileCopy[];
     overviews?: ReadonlyMap<string, OverviewSidecar>;
 }
 export interface KcResources {
@@ -29,4 +27,3 @@ export interface KcResources {
  * The resources reference the built-in system types; they do not create them.
  */
 export declare function generateCatalogResources(model: SemanticModel, opts: KcGenerateOptions): KcResources;
-export declare function fileCopyData(file: FileCopy): Record<string, any>;

package/build/ts/kcmd/semantic/knowledge_catalog.js

@@ -28,14 +28,6 @@
 // and `kc_actions.ts` and `kc_constraints.ts` encode the aspects they carry.
 // This module only appends the entries those two return.
 //
-// With the first-generation aspects (v2Aspects off), each model and profile
-// file the push read is also stored whole as a file copy, one
-// `semantic-model-file` entry per file, parented to the anchor. That type is
-// custom too. The aspects cannot hold the whole model, so a pull returns
-// these copies instead of rebuilding the file from them. The anchor of a
-// model with copies carries their push id in the `kcmd-push-id` label on its
-// entrySource.
-//
 // Aspect data shapes mirror the aspect types' CLOSED metadataTemplates exactly
 // (a server aspect type rejects an undeclared data field):
 //   * semantic-model  = { deploymentTargets: string[] }
@@ -81,11 +73,9 @@
 //
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCatalogResources = generateCatalogResources;
-exports.fileCopyData = fileCopyData;
 const deployment_target_1 = require("./deployment_target");
 const kc_actions_1 = require("./kc_actions");
 const kc_constraints_1 = require("./kc_constraints");
-const kc_custom_types_1 = require("./kc_custom_types");
 const kc_ids_1 = require("./kc_ids");
 const loader_1 = require("./loader");
 const osi_converter_1 = require("./osi_converter");
@@ -112,13 +102,6 @@ function generateCatalogResources(model, opts) {
     const v2 = opts.v2Aspects ?? false;
     if (v2)
         warnings.push(...unstorableMemberWarnings(model));
-    // The first-generation aspects have no field for a vendor's extension
-    // blocks, and the stored copy of the model file keeps them.
-    if (!v2 && opts.sourceFiles?.length && hasThirdPartyExtensions(model)) {
-        warnings.push('custom_extensions from vendors other than GOOGLE are not indexed ' +
-            'by the Knowledge Catalog aspects; the stored copy of the model file ' +
-            'preserves them');
-    }
     // With the first-generation aspects, a subtype field that only rebinds an
     // inherited field is published with the definition it inherits.
     const inherited = v2 ? undefined : inheritedFields(model);
@@ -161,7 +144,9 @@ function generateCatalogResources(model, opts) {
             continue;
         entityEntryName.set(entity.name, names.entry(entityId));
         if (v2 ? lacksKeys(model, entity) : !entity.keys || !entity.keys.length) {
-            warnings.push(`entity '${entity.name}': no keys declared in the source model`);
+            warnings.push(`entity '${entity.name}': no keys declared in the source model; ` +
+                `declare primary_key or unique_keys in the model file or in a ` +
+                `profile to record a key in Knowledge Catalog`);
         }
         entries.push({
             name: names.entry(entityId),
@@ -234,38 +219,6 @@ function generateCatalogResources(model, opts) {
         anchor: modelEntryName,
         claim: (id, label) => claim(seen, id, 'entry', label, warnings),
     }, warnings));
-    // One file copy entry per model and profile file, holding its text as
-    // read. Only with the first-generation aspects: a push with v2Aspects on
-    // emits none, so delete reconciliation removes the copies under the owned
-    // `.files.` prefix. Two file names that slug to one id fail the push, since
-    // storing only one would lose the other on the next pull.
-    if (!v2) {
-        const fileById = new Map();
-        let pushId;
-        for (const file of opts.sourceFiles ?? []) {
-            const id = names.fileEntryId(model.name, file.fileName);
-            const earlier = fileById.get(id);
-            if (earlier !== undefined) {
-                throw new Error(`files '${earlier}' and '${file.fileName}' both map to entry id ` +
-                    `'${id}'; rename one of them`);
-            }
-            fileById.set(id, file.fileName);
-            if (!claim(seen, id, 'entry', `file '${file.fileName}'`, warnings))
-                continue;
-            entries.push(fileCopyEntry(names.entry(id), modelEntryName, file, opts));
-            pushId ??= file.pushId;
-        }
-        // The anchor is written before the copies and is labeled with the push id
-        // they carry. A pull that finds the label and no copies from that push
-        // knows the last push stopped before storing them. A model an older kcmd
-        // pushed has no label.
-        if (pushId !== undefined) {
-            entries[0].entrySource = {
-                ...entries[0].entrySource,
-                labels: { [kc_custom_types_1.PUSH_ID_LABEL]: pushId },
-            };
-        }
-    }
     const entryLinks = v2Relationships ?
         [
             ...v2Relationships.links,
@@ -497,42 +450,6 @@ function schemaJoinAspectData(model, rel) {
 function entityByName(model, name) {
     return (model.entities ?? []).find(e => e.name === name);
 }
-// The entry holding one file copy. Its entry and aspect types are custom, so
-// they live in the destination project.
-function fileCopyEntry(name, anchor, file, dest) {
-    return {
-        name,
-        entryType: (0, kc_custom_types_1.customEntryTypeName)(kc_custom_types_1.FILE_COPY_TYPE_ID, dest),
-        parentEntry: anchor,
-        aspects: {
-            [(0, kc_custom_types_1.customAspectKey)(kc_custom_types_1.FILE_COPY_TYPE_ID, dest)]: {
-                aspectType: (0, kc_custom_types_1.customAspectTypeName)(kc_custom_types_1.FILE_COPY_TYPE_ID, dest),
-                data: fileCopyData(file),
-            },
-        },
-    };
-}
-// The aspect data of a file copy: the file's name and text, and the push id
-// and copy count when the push set them.
-function fileCopyData(file) {
-    return compact({
-        fileName: file.fileName,
-        content: file.content,
-        pushId: file.pushId,
-        pushFileCount: file.pushFileCount,
-    });
-}
-// True when the model, or anything in it, carries a `custom_extensions` block
-// from a vendor other than GOOGLE.
-function hasThirdPartyExtensions(model) {
-    const thirdParty = (o) => (o.customExtensions ?? []).some(x => x.vendorName !== 'GOOGLE');
-    const entities = model.entities ?? [];
-    return thirdParty(model) || entities.some(thirdParty) ||
-        entities.some(e => (e.fields ?? []).some(thirdParty)) ||
-        (model.relationships ?? []).some(thirdParty) ||
-        (model.metrics ?? []).some(thirdParty) ||
-        (model.actions ?? []).some(thirdParty);
-}
 // One warning for each custom `ai_context` member that `guidelines` leaves
 // out, on the model, an entity, a field, a metric or a relationship.
 function unstorableMemberWarnings(model) {