edge-impulse-linux 1.4.8 → 1.5.0

package/build/cli/linux/webserver/views/escape-html-template-tag/escape.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HtmlSafeString = exports.safe = exports.join = void 0;
+const ENTITIES = {
+    '&': '&',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#39;',
+    '/': '&#x2F;',
+    '`': '&#x60;',
+    '=': '&#x3D;'
+};
+const inspect = Symbol.for('nodejs.util.inspect.custom');
+const ENT_REGEX = new RegExp(Object.keys(ENTITIES).join('|'), 'g');
+function join(array, separator) {
+    if (separator === undefined || separator === null) {
+        separator = ',';
+    }
+    if (array.length <= 0) {
+        return new HtmlSafeString([''], []);
+    }
+    return new HtmlSafeString(['', ...Array(array.length - 1).fill(separator), ''], array);
+}
+exports.join = join;
+function safe(value) {
+    return new HtmlSafeString([String(value)], []);
+}
+exports.safe = safe;
+function escapehtml(unsafe) {
+    if (unsafe instanceof HtmlSafeString) {
+        return unsafe.toString();
+    }
+    if (Array.isArray(unsafe)) {
+        return join(unsafe, '').toString();
+    }
+    return String(unsafe).replace(ENT_REGEX, (char) => ENTITIES[char]);
+}
+class HtmlSafeString {
+    constructor(parts, subs) {
+        this._parts = parts;
+        this._subs = subs;
+    }
+    toString() {
+        return this._parts.reduce((result, part, i) => {
+            const sub = this._subs[i - 1];
+            return result + escapehtml(sub) + part;
+        });
+    }
+    [inspect]() {
+        return `HtmlSafeString '${this.toString()}'`;
+    }
+}
+exports.HtmlSafeString = HtmlSafeString;
+function escapeHtml(parts, ...subs) {
+    return new HtmlSafeString(parts, subs);
+}
+exports.default = escapeHtml;
+//# sourceMappingURL=escape.js.map

package/build/cli/linux/webserver/views/escape-html-template-tag/escape.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"escape.js","sourceRoot":"","sources":["../../../../../../cli/linux/webserver/views/escape-html-template-tag/escape.ts"],"names":[],"mappings":";;;AAAA,MAAM,QAAQ,GAEV;IACA,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,QAAQ;CAChB,CAAC;AAEF,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAEzD,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AAEnE,SAAgB,IAAI,CAAC,KAAkC,EAAE,SAAkC;IACvF,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE;QAC/C,SAAS,GAAG,GAAG,CAAC;KACnB;IACD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACnB,OAAO,IAAI,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;KACvC;IACD,OAAO,IAAI,cAAc,CAAC,CAAC,EAAE,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AAC3F,CAAC;AARD,oBAQC;AAED,SAAgB,IAAI,CAAC,KAAc;IAC/B,OAAO,IAAI,cAAc,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACnD,CAAC;AAFD,oBAEC;AAED,SAAS,UAAU,CAAC,MAAe;IAC/B,IAAI,MAAM,YAAY,cAAc,EAAE;QAClC,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;KAC5B;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACvB,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;KACtC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAa,cAAc;IAGvB,YAAY,KAAwB,EAAE,IAAwB;QAC1D,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;YAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,OAAO,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,CAAC,OAAO,CAAC;QACL,OAAO,mBAAmB,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;IACjD,CAAC;CACJ;AAlBD,wCAkBC;AAED,SAAwB,UAAU,CAAC,KAA2B,EAAE,GAAG,IAAe;IAC9E,OAAO,IAAI,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAC3C,CAAC;AAFD,6BAEC"}

package/build/cli/linux/webserver/views/escape-html-template-tag/index.d.ts

@@ -0,0 +1,7 @@
+import escapeHtml, { join, safe } from './escape';
+declare const _default: typeof escapeHtml & {
+    default: typeof escapeHtml;
+    join: typeof join;
+    safe: typeof safe;
+};
+export default _default;

package/build/cli/linux/webserver/views/escape-html-template-tag/index.js

@@ -0,0 +1,24 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const escape_1 = __importStar(require("./escape"));
+exports.default = Object.assign(escape_1.default, { default: escape_1.default, join: escape_1.join, safe: escape_1.safe });
+//# sourceMappingURL=index.js.map

package/build/cli/linux/webserver/views/escape-html-template-tag/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../cli/linux/webserver/views/escape-html-template-tag/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,mDAAkD;AAClD,kBAAe,MAAM,CAAC,MAAM,CAAC,gBAAU,EAAE,EAAE,OAAO,EAAE,gBAAU,EAAE,IAAI,EAAJ,aAAI,EAAE,IAAI,EAAJ,aAAI,EAAE,CAAC,CAAC"}

package/build/cli/linux/webserver/views/inference-server-view.d.ts

@@ -0,0 +1,10 @@
+export declare type InferenceServerViewModel = {
+    studioLink: string;
+    owner: string;
+    projectName: string;
+    projectVersion: number;
+    serverPort: number;
+    featuresCount: number;
+    mode: 'features' | 'image';
+};
+export declare const renderInferenceServerView: (vm: InferenceServerViewModel) => import("./escape-html-template-tag/escape").HtmlSafeString;

package/build/cli/linux/webserver/views/inference-server-view.js

@@ -0,0 +1,138 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderInferenceServerView = void 0;
+const escape_html_template_tag_1 = __importDefault(require("./escape-html-template-tag"));
+exports.renderInferenceServerView = (vm) => {
+    return escape_html_template_tag_1.default `<!DOCTYPE html>
+    <html>
+
+    <head>
+        <meta charset="utf-8">
+        <title>${vm.owner} / ${vm.projectName} (v${vm.projectVersion}) - Edge Impulse inference server</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0,user-scalable=0" />
+        <link rel="stylesheet" href="/assets/argon-dashboard.css">
+        <link rel="stylesheet" href="/assets/mobileclient.css">
+        <!-- generics -->
+        <link rel="icon" href="/assets/favicon-color/favicon-32.png" sizes="32x32">
+        <link rel="icon" href="/assets/favicon-color/favicon-57.png" sizes="57x57">
+        <link rel="icon" href="/assets/favicon-color/favicon-76.png" sizes="76x76">
+        <link rel="icon" href="/assets/favicon-color/favicon-96.png" sizes="96x96">
+        <link rel="icon" href="/assets/favicon-color/favicon-128.png" sizes="128x128">
+        <link rel="icon" href="/assets/favicon-color/favicon-196.png" sizes="196x196">
+        <link rel="icon" href="/assets/favicon-color/favicon-228.png" sizes="228x228">
+        <!-- Android -->
+        <link rel="shortcut icon" href="/assets/favicon-color/favicon-196.png" sizes="196x196">
+        <!-- iOS -->
+        <link rel="apple-touch-icon" href="/assets/favicon-color/favicon-120.png" sizes="120x120">
+        <link rel="apple-touch-icon" href="/assets/favicon-color/favicon-152.png" sizes="152x152">
+        <link rel="apple-touch-icon" href="/assets/favicon-color/favicon-180.png" sizes="180x180">
+        <!-- Windows -->
+        <meta name="msapplication-TileColor" content="#FFFFFF">
+        <meta name="msapplication-TileImage" content="/assets/favicon-color/favicon-144.png">
+
+        <!-- (c) Copyright 2024, Edge Impulse Inc. -->
+    </head>
+
+    <body>
+        <div class="container-fluid">
+            <div class="row align-items-center border-bottom" id="header-row">
+                <div class="col-auto mt-3 mb-3 pr-0">
+                    <img src="/assets/mark.svg">
+                </div>
+                <div class="col align-middle inference-server-view-title-col">
+                    <h1 class="text-dark mb-0 border-left pl-4"
+                        title="Edge Impulse inference server">
+                        Edge Impulse inference server
+                    </h1>
+                </div>
+            </div>
+            <div class="row mt-3">
+                <div class="col">
+                    <div class="card shadow">
+                        <div class="card-body text-left mb--4">
+                            <div class="row card-sub-header border-bottom mt--2">
+                                <div class="col">
+                                    <h4>Model information</h4>
+                                </div>
+                            </div>
+                            <div class="mb-3 text-sm">
+                                Inference server for "<a href="${vm.studioLink}" target="_blank">${vm.owner} / ${vm.projectName}</a>" (v${vm.projectVersion})
+                            </div>
+                            <div class="row card-sub-header border-bottom">
+                                <div class="col">
+                                    <h4>How to run inference</h4>
+                                </div>
+                            </div>
+                            ${vm.mode === 'image' ? escape_html_template_tag_1.default `
+                            <div class="mb-3 text-sm">
+                                <code>curl -v -X POST -F 'file=@path-to-an-image.jpg' http://localhost:${vm.serverPort}/api/image</code>
+                            </div>
+                            ` : escape_html_template_tag_1.default `
+                            <div class="mb-3 text-sm">
+                                <code>curl -v -X POST -H "Content-Type: application/json" -d '{"features": [5, 10, 15, 20]}' http://localhost:${vm.serverPort}/api/features</code>
+                            </div>
+                            <div class="mb-4 text-xs">
+                                (Expecting ${vm.featuresCount} features for this model)
+                            </div>
+                            `}
+                        </div>
+                    </div>
+                    <div class="card shadow mt-4">
+                        <div class="card-body text-left mb--3">
+                            <div class="row card-sub-header border-bottom mt--2">
+                                <div class="col">
+                                    <h4>Try it out</h4>
+                                </div>
+                            </div>
+                            ${vm.mode === 'image' ? escape_html_template_tag_1.default `
+                            <div class="mb-3">
+                                <input type="file" class="form-control form-control-sm border-0 px-0" id="upload-file">
+                            </div>
+                            ` : escape_html_template_tag_1.default `
+                            <div class="mb-2 text-sm">
+                                Enter ${vm.featuresCount} features, split by ',' - for example from "Live classification".
+                            </div>
+                            <div class="mb-3">
+                                <input class="form-control form-control-sm" id="features" placeholder="0, 0, 0, 0, ...">
+                            </div>
+                            `}
+                            <div class="mb-3">
+                                <button class="btn-sm btn btn-primary" id="run-inference" disabled>Run inference</button>
+                            </div>
+                            <section id="result-section" style="display: none">
+                                <div class="row card-sub-header border-bottom">
+                                    <div class="col">
+                                        <h4>Result</h4>
+                                    </div>
+                                </div>
+                                <pre class="mb-3 text-xs">Bleep bloop</pre>
+                            </section>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <footer class="footer">
+            <div class="row">
+                <div class="col text-center">
+                    <div class="copyright text-center text-muted">
+                        <i class="fas fa-code"></i>
+                        Developed by <a href="https://edgeimpulse.com" class="font-weight-bold" target="_blank">Edge Impulse</a>.
+                    </div>
+                </div>
+            </div>
+        </footer>
+
+        <script type="text/javascript" src="/inference-server.js"></script>
+        <script>
+            window.InferenceServer();
+        </script>
+    </body>
+    </html>
+    `;
+};
+//# sourceMappingURL=inference-server-view.js.map

package/build/cli/linux/webserver/views/inference-server-view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inference-server-view.js","sourceRoot":"","sources":["../../../../../cli/linux/webserver/views/inference-server-view.ts"],"names":[],"mappings":";;;;;;AAAA,0FAA8C;AAYjC,QAAA,yBAAyB,GAAG,CAAC,EAA4B,EAAE,EAAE;IACtE,OAAO,kCAAI,CAAA;;;;;iBAKE,EAAE,CAAC,KAAK,MAAM,EAAE,CAAC,WAAW,MAAM,EAAE,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iEAgDH,EAAE,CAAC,UAAU,qBAAqB,EAAE,CAAC,KAAK,MAAM,EAAE,CAAC,WAAW,WAAW,EAAE,CAAC,cAAc;;;;;;;8BAO7H,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,kCAAI,CAAA;;yGAEiD,EAAE,CAAC,UAAU;;6BAEzF,CAAC,CAAC,CAAC,kCAAI,CAAA;;gJAE4G,EAAE,CAAC,UAAU;;;6CAGhH,EAAE,CAAC,aAAa;;6BAEhC;;;;;;;;;;8BAUC,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,kCAAI,CAAA;;;;6BAI3B,CAAC,CAAC,CAAC,kCAAI,CAAA;;wCAEI,EAAE,CAAC,aAAa;;;;;6BAK3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAmCxB,CAAC;AACN,CAAC,CAAC"}

package/build/cli/make-image.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EdgeImpulseConfig } from './config';
-import { ExportInputBoundingBox, ExportUploaderInfoFileCategory } from '../shared/bounding-box-file-types';
+import { ExportInputBoundingBox, ExportUploaderInfoFileCategory, ExportUploaderInfoFileLabel } from '../shared/bounding-box-file-types';
 export declare const EXTENSION_MAPPING: {
     [k: string]: string;
 };
@@ -9,13 +9,8 @@ export declare function upload(opts: {
     filename: string;
     buffer: Buffer;
     label: {
-        type: 'unlabeled';
-    } | {
         type: 'infer';
-    } | {
-        type: 'label';
-        label: string;
-    };
+    } | ExportUploaderInfoFileLabel;
     allowDuplicates: boolean;
     apiKey: string;
     config: EdgeImpulseConfig;

package/build/cli/make-image.js

@@ -42,6 +42,9 @@ async function upload(opts) {
         headers['x-label'] = encoding_1.default('');
         headers['x-no-label'] = '1';
     }
+    else if (opts.label.type === 'multi-label') {
+        // gets set with a separate file, see below
+    }
     if (!opts.allowDuplicates) {
         headers['x-disallow-duplicates'] = '1';
     }
@@ -64,6 +67,18 @@ async function upload(opts) {
         filename: opts.filename,
         contentType: exports.EXTENSION_MAPPING[ext] || 'application/octet-stream',
     });
+    if (opts.label.type === 'multi-label') {
+        let labelsFile = {
+            type: 'structured-labels',
+            version: 1,
+            structuredLabels: {}
+        };
+        labelsFile.structuredLabels[opts.filename] = opts.label.labels;
+        form.append('data', Buffer.from(JSON.stringify(labelsFile), 'utf-8'), {
+            filename: 'structured_labels.labels',
+            contentType: 'application/json',
+        });
+    }
     let res = await node_fetch_1.default(opts.config.endpoints.internal.ingestion + '/api/' + category + '/files', {
         method: 'POST',
         headers: headers,

package/build/cli/make-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-image.js","sourceRoot":"","sources":["../../cli/make-image.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"make-image.js","sourceRoot":"","sources":["../../cli/make-image.ts"],"names":[],"mappings":"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"}

package/build/library/classifier/image-classifier.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from "tsee";
-import { LinuxImpulseRunner, RunnerClassifyResponseSuccess } from "./linux-impulse-runner";
+import { LinuxImpulseRunner, ModelInformation, RunnerClassifyResponseSuccess } from "./linux-impulse-runner";
+import sharp from 'sharp';
 import { ICamera } from "../sensors/icamera";
 export declare class ImageClassifier extends EventEmitter<{
     result: (result: RunnerClassifyResponseSuccess, timeMs: number, imgAsJpeg: Buffer) => void;
@@ -23,5 +24,8 @@ export declare class ImageClassifier extends EventEmitter<{
      * Stop the classifier
      */
     stop(): Promise<void>;
-    private resizeImage;
+    static resizeImage(model: ModelInformation, data: Buffer): Promise<{
+        img: sharp.Sharp;
+        features: number[];
+    }>;
 }

package/build/library/classifier/image-classifier.js

@@ -33,7 +33,7 @@ class ImageClassifier extends tsee_1.EventEmitter {
         this._camera.on('snapshot', async (data) => {
             // are we looking at video? Then we always add to the frameQueue
             if (model.modelParameters.image_input_frames > 1) {
-                let resized = await this.resizeImage(model, data);
+                let resized = await ImageClassifier.resizeImage(model, data);
                 frameQueue.push(resized);
             }
             // still running inferencing?
@@ -52,7 +52,7 @@ class ImageClassifier extends tsee_1.EventEmitter {
                     frameQueue = frameQueue.slice(frameQueue.length - model.modelParameters.image_input_frames);
                 }
                 else {
-                    let resized = await this.resizeImage(model, data);
+                    let resized = await ImageClassifier.resizeImage(model, data);
                     frameQueue = [resized];
                 }
                 let img = frameQueue[frameQueue.length - 1].img;
@@ -90,7 +90,7 @@ class ImageClassifier extends tsee_1.EventEmitter {
             this._runner.stop()
         ]);
     }
-    async resizeImage(model, data) {
+    static async resizeImage(model, data) {
         // resize image and add to frameQueue
         let img;
         let features = [];

package/build/library/classifier/image-classifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-classifier.js","sourceRoot":"","sources":["../../../library/classifier/image-classifier.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"image-classifier.js","sourceRoot":"","sources":["../../../library/classifier/image-classifier.ts"],"names":[],"mappings":"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"}

package/build/sdk/studio/sdk/api/adminApi.d.ts

@@ -14,10 +14,14 @@ import { AdminAddOrUpdateSSODomainIdPsRequest } from '../model/adminAddOrUpdateS
 import { AdminAddOrganizationUserRequest } from '../model/adminAddOrganizationUserRequest';
 import { AdminAddProjectUserRequest } from '../model/adminAddProjectUserRequest';
 import { AdminCreateOrganizationRequest } from '../model/adminCreateOrganizationRequest';
+import { AdminCreateProjectRequest } from '../model/adminCreateProjectRequest';
 import { AdminGetDataMigrationResponse } from '../model/adminGetDataMigrationResponse';
 import { AdminGetDataMigrationsResponse } from '../model/adminGetDataMigrationsResponse';
 import { AdminGetDisallowedEmailDomainsResponse } from '../model/adminGetDisallowedEmailDomainsResponse';
 import { AdminGetMetricsResponse } from '../model/adminGetMetricsResponse';
+import { AdminGetOrganizationComputeTimeUsageResponse } from '../model/adminGetOrganizationComputeTimeUsageResponse';
+import { AdminGetOrganizationUsageReportResponse } from '../model/adminGetOrganizationUsageReportResponse';
+import { AdminGetOrganizationUsageReportsResponse } from '../model/adminGetOrganizationUsageReportsResponse';
 import { AdminGetOrganizationsResponse } from '../model/adminGetOrganizationsResponse';
 import { AdminGetSSODomainIdPsResponse } from '../model/adminGetSSODomainIdPsResponse';
 import { AdminGetSSOSettingsResponse } from '../model/adminGetSSOSettingsResponse';
@@ -34,6 +38,7 @@ import { AdminUpdateUserPermissionsRequest } from '../model/adminUpdateUserPermi
 import { AdminUpdateUserRequest } from '../model/adminUpdateUserRequest';
 import { AdminUpdateUserTrialRequest } from '../model/adminUpdateUserTrialRequest';
 import { CreateOrganizationResponse } from '../model/createOrganizationResponse';
+import { CreateProjectResponse } from '../model/createProjectResponse';
 import { EntityCreatedResponse } from '../model/entityCreatedResponse';
 import { Feature } from '../model/feature';
 import { FindUserResponse } from '../model/findUserResponse';
@@ -46,6 +51,7 @@ import { JobMetricsResponse } from '../model/jobMetricsResponse';
 import { JobParentTypeEnum } from '../model/jobParentTypeEnum';
 import { ProjectInfoResponse } from '../model/projectInfoResponse';
 import { StartEnterpriseTrialRequest } from '../model/startEnterpriseTrialRequest';
+import { StartJobResponse } from '../model/startJobResponse';
 import { UpdateProjectRequest } from '../model/updateProjectRequest';
 import { Authentication } from '../model/models';
 import { ApiKeyAuth } from '../model/models';
@@ -54,6 +60,10 @@ export declare enum AdminApiApiKeys {
     JWTAuthentication = 1,
     JWTHttpHeaderAuthentication = 2
 }
+declare type adminCreateOrganizationUsageReportQueryParams = {
+    startDate: Date;
+    endDate: Date;
+};
 declare type adminDeleteOrganizationQueryParams = {
     fullDeletion?: boolean;
 };
@@ -75,8 +85,20 @@ declare type adminGetJobsLogsQueryParams = {
 declare type adminGetJobsMetricsQueryParams = {
     parentType: JobParentTypeEnum;
 };
+declare type adminGetOrganizationComputeTimeUsageQueryParams = {
+    startDate: Date;
+    endDate: Date;
+};
+declare type adminGetOrganizationInfoQueryParams = {
+    includeDeleted?: boolean;
+};
+declare type adminGetOrganizationUsageReportsQueryParams = {
+    limit?: number;
+    offset?: number;
+};
 declare type adminGetOrganizationsQueryParams = {
     active?: number;
+    includeDeleted?: boolean;
     sort?: string;
     limit?: number;
     offset?: number;
@@ -185,6 +207,39 @@ export declare class AdminApi {
             [name: string]: string;
         };
     }): Promise<CreateOrganizationResponse>;
+    /**
+     * Admin-only API to create a new project for an organization.
+     * @summary Create a new organization project
+     * @param organizationId Organization ID
+     * @param adminCreateProjectRequest
+     */
+    adminCreateOrganizationProject(organizationId: number, adminCreateProjectRequest: AdminCreateProjectRequest, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<CreateProjectResponse>;
+    /**
+     * Admin-only API to create a new usage report for an organization. A job is created to process the report request and the job details are returned in the response.
+     * @summary Creates a new usage report
+     * @param organizationId Organization ID
+     * @param startDate Start date
+     * @param endDate End date
+     */
+    adminCreateOrganizationUsageReport(organizationId: number, queryParams: adminCreateOrganizationUsageReportQueryParams, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<StartJobResponse>;
+    /**
+     * Admin-only API to create a new free tier project.
+     * @summary Create a new project
+     * @param adminCreateProjectRequest
+     */
+    adminCreateProject(adminCreateProjectRequest: AdminCreateProjectRequest, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<CreateProjectResponse>;
     /**
      * Admin-only API to create an enterprise trial for a user.
      * @summary Create user enterprise trial
@@ -217,6 +272,17 @@ export declare class AdminApi {
             [name: string]: string;
         };
     }): Promise<GenericApiResponse>;
+    /**
+     * Admin-only API to delete a usage report for an organization.
+     * @summary Delete usage report
+     * @param organizationId Organization ID
+     * @param usageReportId Usage report ID
+     */
+    adminDeleteOrganizationUsageReport(organizationId: number, usageReportId: number, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<GenericApiResponse>;
     /**
      * Admin-only API to delete a project.
      * @summary Delete a project
@@ -247,7 +313,7 @@ export declare class AdminApi {
         headers: {
             [name: string]: string;
         };
-    }): Promise<GenericApiResponse>;
+    }): Promise<StartJobResponse>;
     /**
      * Admin-only API to delete an enterprise trial for a user.
      * @summary Delete user enterprise trial
@@ -269,6 +335,17 @@ export declare class AdminApi {
             [name: string]: string;
         };
     }): Promise<GenericApiResponse>;
+    /**
+     * Admin-only API to download a usage report for an organization.
+     * @summary Download usage report
+     * @param organizationId Organization ID
+     * @param usageReportId Usage report ID
+     */
+    adminDownloadOrganizationUsageReport(organizationId: number, usageReportId: number, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<any>;
     /**
      * Admin-only API to set a feature flag ON. Setting a feature flag ON essentially enables the feature for all users.
      * @summary Set a feature flag ON
@@ -358,7 +435,7 @@ export declare class AdminApi {
      * Get the job execution details including inner jobs
      * @summary Get job execution details
      * @param jobId Job ID
-     * @param parentType Job parent type (project or organization)
+     * @param parentType Job parent type (project, organization, or standalone)
      * @param includeChildrenJobs Include the details of each of the children jobs (recursively)
      */
     adminGetJobDetails(jobId: number, queryParams: adminGetJobDetailsQueryParams, options?: {
@@ -370,7 +447,7 @@ export declare class AdminApi {
      * Get the logs for a job.
      * @summary Get job logs
      * @param jobId Job ID
-     * @param parentType Job parent type (project or organization)
+     * @param parentType Job parent type (project, organization, or standalone)
      * @param limit Maximum number of logs
      * @param offset Start fetching logs from this offset
      */
@@ -383,7 +460,7 @@ export declare class AdminApi {
      * Get cpu/memory usage metrics, if the job is a Kubernetes job
      * @summary Get job usage metrics
      * @param jobId Job ID
-     * @param parentType Job parent type (project or organization)
+     * @param parentType Job parent type (project, organization, or standalone)
      */
     adminGetJobsMetrics(jobId: number, queryParams: adminGetJobsMetricsQueryParams, options?: {
         headers: {
@@ -399,20 +476,57 @@ export declare class AdminApi {
             [name: string]: string;
         };
     }): Promise<AdminGetMetricsResponse>;
+    /**
+     * Admin-only API to get compute time usage for an organization over a period of time.
+     * @summary Get organization compute time usage
+     * @param organizationId Organization ID
+     * @param startDate Start date
+     * @param endDate End date
+     */
+    adminGetOrganizationComputeTimeUsage(organizationId: number, queryParams: adminGetOrganizationComputeTimeUsageQueryParams, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<AdminGetOrganizationComputeTimeUsageResponse>;
     /**
      * Admin-only API to list all information about this organization.
      * @summary Organization information
      * @param organizationId Organization ID
+     * @param includeDeleted Whether to include deleted entities (users, projects, orgs)
      */
-    adminGetOrganizationInfo(organizationId: number, options?: {
+    adminGetOrganizationInfo(organizationId: number, queryParams: adminGetOrganizationInfoQueryParams, options?: {
         headers: {
             [name: string]: string;
         };
     }): Promise<AdminOrganizationInfoResponse>;
+    /**
+     * Admin-only API to get a usage report for an organization.
+     * @summary Get usage report
+     * @param organizationId Organization ID
+     * @param usageReportId Usage report ID
+     */
+    adminGetOrganizationUsageReport(organizationId: number, usageReportId: number, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<AdminGetOrganizationUsageReportResponse>;
+    /**
+     * Admin-only API to get all usage reports for an organization.
+     * @summary Get all usage reports
+     * @param organizationId Organization ID
+     * @param limit Maximum number of results
+     * @param offset Offset in results, can be used in conjunction with LimitResultsParameter to implement paging.
+     */
+    adminGetOrganizationUsageReports(organizationId: number, queryParams: adminGetOrganizationUsageReportsQueryParams, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<AdminGetOrganizationUsageReportsResponse>;
     /**
      * Admin-only API to get the list of all organizations.
      * @summary Get all organizations
      * @param active Whether to search for entities (users, orgs) active in the last X days
+     * @param includeDeleted Whether to include deleted entities (users, projects, orgs)
      * @param sort Fields and order to sort query by
      * @param limit Maximum number of results
      * @param offset Offset in results, can be used in conjunction with LimitResultsParameter to implement paging.
@@ -545,6 +659,16 @@ export declare class AdminApi {
             [name: string]: string;
         };
     }): Promise<GenericApiResponse>;
+    /**
+     * Admin-only API to restore a soft deleted organization. All organization projects sharing the same deletion date as that of the organization will also be restored. If this is a trial organization that was never upgraded to a paid plan then the organization will be restored to its original trial state.
+     * @summary Restore an organization
+     * @param organizationId Organization ID
+     */
+    adminRestoreOrganization(organizationId: number, options?: {
+        headers: {
+            [name: string]: string;
+        };
+    }): Promise<GenericApiResponse>;
     /**
      * Admin-only API to run or pause a data migration.
      * @summary Run or pause a data migration