@mutagent/sdk 0.2.141 → 0.3.0

package/src/lib/sdks.ts

@@ -24,6 +24,7 @@ import {
   matchContentType,
 } from "./http.js";
 import { Logger } from "./logger.js";
+import { combineSignals } from "./primitives.js";
 import { retry, RetryConfig } from "./retries.js";
 import { SecurityState } from "./security.js";
 
@@ -131,27 +132,55 @@ export class ClientSDK {
     if (path) {
       baseURL.pathname = baseURL.pathname.replace(/\/+$/, "") + "/";
       reqURL = new URL(path, baseURL);
+      if (!reqURL.search && baseURL.search) {
+        reqURL.search = baseURL.search;
+      }
     } else {
       reqURL = baseURL;
     }
     reqURL.hash = "";
 
-    let finalQuery = query || "";
-
-    const secQuery: string[] = [];
-    for (const [k, v] of Object.entries(security?.queryParams || {})) {
-      const q = encodeForm(k, v, { charEncoding: "percent" });
-      if (typeof q !== "undefined") {
-        secQuery.push(q);
+    // Appends already-encoded query pairs to a query string, replacing any
+    // existing pairs with the same key so later sources take precedence.
+    const mergeQuery = (current: string, additions: string): string => {
+      if (!additions) {
+        return current;
       }
-    }
-    if (secQuery.length) {
-      finalQuery += `&${secQuery.join("&")}`;
-    }
+      const additionKeys = new Set(
+        additions
+          .split("&")
+          .filter((pair) => pair !== "")
+          .map((pair) => pair.split("=")[0] ?? ""),
+      );
+      const kept = current.split("&").filter((pair) => {
+        return pair !== "" && !additionKeys.has(pair.split("=")[0] ?? "");
+      });
+      return [...kept, additions].join("&");
+    };
+
+    const encodeQueryRecord = (record: Record<string, unknown>): string => {
+      return Object.entries(record)
+        .map(([k, v]) => {
+          if (v == null) {
+            return undefined;
+          }
+          const value = v;
+          return encodeForm(k, value, {
+            explode: Array.isArray(value),
+            charEncoding: "percent",
+          });
+        })
+        .filter((pair): pair is string => typeof pair !== "undefined")
+        .join("&");
+    };
+
+    const finalQuery = [
+      query || "",
+      encodeQueryRecord(security?.queryParams || {}),
+    ].reduce(mergeQuery, reqURL.search.slice(1));
 
     if (finalQuery) {
-      const q = finalQuery.startsWith("&") ? finalQuery.slice(1) : finalQuery;
-      reqURL.search = `?${q}`;
+      reqURL.search = `?${finalQuery}`;
     }
 
     const headers = new Headers(opHeaders);
@@ -197,9 +226,8 @@ export class ClientSDK {
       ...options?.fetchOptions,
       ...options,
     };
-    if (!fetchOptions?.signal && conf.timeoutMs && conf.timeoutMs > 0) {
-      const timeoutSignal = AbortSignal.timeout(conf.timeoutMs);
-      fetchOptions.signal = timeoutSignal;
+    if (!fetchOptions?.signal && conf.timeoutMs != null && conf.timeoutMs > 0) {
+      context.timeoutMs = conf.timeoutMs;
     }
 
     if (conf.body instanceof ReadableStream) {
@@ -246,10 +274,19 @@ export class ClientSDK {
     >
   > {
     const { context, isErrorStatusCode } = options;
+    const timeoutMs = context.timeoutMs;
 
     return retry(
       async () => {
-        const req = await this.#hooks.beforeRequest(context, request.clone());
+        const cloned = request.clone();
+        let attempt = cloned;
+        if (timeoutMs != null && timeoutMs > 0) {
+          const timeoutSignal = AbortSignal.timeout(timeoutMs);
+          const combined = combineSignals(cloned.signal, timeoutSignal)
+            ?? timeoutSignal;
+          attempt = new Request(cloned, { signal: combined });
+        }
+        const req = await this.#hooks.beforeRequest(context, attempt);
         await logRequest(this.#logger, req).catch((e) =>
           this.#logger?.log("Failed to log request:", e)
         );

package/src/lib/security.ts

@@ -13,17 +13,22 @@ type OAuth2PasswordFlow = {
   tokenURL: string;
 };
 
-export enum SecurityErrorCode {
-  Incomplete = "incomplete",
-  UnrecognisedSecurityType = "unrecognized_security_type",
-}
+export const SecurityErrorCode = {
+  Incomplete: "incomplete",
+  UnrecognisedSecurityType: "unrecognized_security_type",
+} as const;
+export type SecurityErrorCode =
+  (typeof SecurityErrorCode)[keyof typeof SecurityErrorCode];
 
 export class SecurityError extends Error {
+  public code: SecurityErrorCode;
+
   constructor(
-    public code: SecurityErrorCode,
+    code: SecurityErrorCode,
     message: string,
   ) {
     super(message);
+    this.code = code;
     this.name = "SecurityError";
   }
 

package/src/models/errors/index.ts

@@ -4,14 +4,11 @@
 
 export * from "./error-message-status-code.js";
 export * from "./error-message.js";
-export * from "./error-response.js";
 export * from "./http-client-errors.js";
 export * from "./mutagent-error.js";
-export * from "./optimization-error.js";
 export * from "./provider-error.js";
 export * from "./response-validation-error.js";
 export * from "./sdk-error.js";
 export * from "./sdk-validation-error.js";
 export * from "./test-connection-result-error.js";
-export * from "./trace-error.js";
 export * from "./ws-error.js";

package/src/models/index.ts

@@ -5,89 +5,35 @@
 export * from "./agent-list.js";
 export * from "./agent-success-response.js";
 export * from "./agent.js";
-export * from "./analytics-summary.js";
-export * from "./array-of-id-prompt-id-workspace-id.js";
-export * from "./array-of-resource-scope-spans.js";
-export * from "./array-of-role-content.js";
-export * from "./batch-ingestion-response.js";
-export * from "./criteria-threshold-model.js";
 export * from "./current-password-new-password.js";
-export * from "./dataset-id-evaluation-id-config.js";
-export * from "./dataset-item-id-dataset-item-index-model-column-id.js";
 export * from "./email-role-expires-in-days.js";
-export * from "./evaluation-aggregation-results.js";
-export * from "./evaluation-history.js";
-export * from "./evaluation-list.js";
-export * from "./evaluation-result.js";
-export * from "./evaluation-run.js";
-export * from "./evaluation.js";
 export * from "./id-display-name-family.js";
 export * from "./id-name-email.js";
 export * from "./id-organization-id-email.js";
-export * from "./id-prompt-id-workspace-id.js";
 export * from "./id-user-id-role.js";
 export * from "./id-user-id-role2.js";
-export * from "./input-evaluation-id-llm-config.js";
-export * from "./input-llm-config.js";
-export * from "./input-output-total.js";
-export * from "./model-temperature-max-tokens.js";
 export * from "./name-api-key-base-url.js";
-export * from "./name-description-eval-config.js";
-export * from "./name-description-is-latest.js";
-export * from "./name-description-metadata.js";
-export * from "./name-description-metadata2.js";
 export * from "./name-description-system-prompt.js";
-export * from "./name-description-version.js";
 export * from "./name-email-avatar-url.js";
-export * from "./name-input-expected-output.js";
-export * from "./name-input-expected-output2.js";
 export * from "./name-provider-api-key.js";
 export * from "./name-slug-description.js";
 export * from "./name-slug-description2.js";
 export * from "./name-slug-description3.js";
 export * from "./name-slug-description4.js";
 export * from "./name-slug-description5.js";
-export * from "./new-version-changes.js";
-export * from "./optimization-job-list.js";
-export * from "./optimization-job-status.js";
-export * from "./optimization-job.js";
-export * from "./optimization-results.js";
-export * from "./optimization-score-progression.js";
-export * from "./optimization-states.js";
 export * from "./org-member-count-or-error-union.js";
 export * from "./org-success-or-error-union.js";
 export * from "./organization-list-or-error-union.js";
 export * from "./organization-or-error-union.js";
-export * from "./paginated-trace-list.js";
-export * from "./prompt-dataset-export.js";
-export * from "./prompt-dataset-item.js";
-export * from "./prompt-dataset-list.js";
-export * from "./prompt-dataset.js";
-export * from "./prompt-id-dataset-id-name.js";
-export * from "./prompt-id-executions.js";
-export * from "./prompt-id-inputs-model.js";
-export * from "./prompt-id-prompt-group-id-evaluation-id.js";
-export * from "./prompt-list.js";
-export * from "./prompt-success-response.js";
-export * from "./prompt.js";
 export * from "./provider-config.js";
 export * from "./provider-configs-list.js";
 export * from "./provider-success.js";
-export * from "./schemaany-of.js";
-export * from "./schemaany-of2.js";
-export * from "./schemadefaul6.js";
-export * from "./schemadefaul8.js";
-export * from "./schemaenum2.js";
-export * from "./schemanullab4.js";
+export * from "./schemadefaul.js";
+export * from "./schemadefaul3.js";
+export * from "./schemanullab2.js";
 export * from "./security.js";
-export * from "./status-summary-completed-at.js";
 export * from "./success-message.js";
-export * from "./target-prompt-id-target-prompt-group-id-new-name.js";
 export * from "./test-connection-result.js";
-export * from "./trace-id-session-id-name.js";
-export * from "./trace-ingestion-response.js";
-export * from "./trace-stats.js";
-export * from "./trace-with-spans.js";
 export * from "./user-id-role-status.js";
 export * from "./user-id-role.js";
 export * from "./workspace.js";

package/src/models/name-api-key-base-url.ts

@@ -9,10 +9,10 @@ import {
   IdDisplayNameFamily$outboundSchema,
 } from "./id-display-name-family.js";
 import {
-  Schemanullab4,
-  Schemanullab4$Outbound,
-  Schemanullab4$outboundSchema,
-} from "./schemanullab4.js";
+  Schemanullab2,
+  Schemanullab2$Outbound,
+  Schemanullab2$outboundSchema,
+} from "./schemanullab2.js";
 
 export type NameApiKeyBaseUrl = {
   /**
@@ -30,7 +30,7 @@ export type NameApiKeyBaseUrl = {
   /**
    * Updated model mappings (null to clear)
    */
-  modelOverrides?: Schemanullab4 | null | undefined;
+  modelOverrides?: Schemanullab2 | null | undefined;
   /**
    * Activate or deactivate this config
    */
@@ -54,7 +54,7 @@ export type NameApiKeyBaseUrl = {
   /**
    * Updated metadata (null to clear)
    */
-  metadata?: Schemanullab4 | null | undefined;
+  metadata?: Schemanullab2 | null | undefined;
 };
 
 /** @internal */
@@ -62,13 +62,13 @@ export type NameApiKeyBaseUrl$Outbound = {
   name?: string | undefined;
   apiKey?: string | undefined;
   baseUrl?: string | null | undefined;
-  modelOverrides?: Schemanullab4$Outbound | null | undefined;
+  modelOverrides?: Schemanullab2$Outbound | null | undefined;
   isActive?: boolean | undefined;
   isDefault?: boolean | undefined;
   family?: string | null | undefined;
   supportedModels?: Array<IdDisplayNameFamily$Outbound> | null | undefined;
   apiVersion?: string | null | undefined;
-  metadata?: Schemanullab4$Outbound | null | undefined;
+  metadata?: Schemanullab2$Outbound | null | undefined;
 };
 
 /** @internal */
@@ -79,7 +79,7 @@ export const NameApiKeyBaseUrl$outboundSchema: z.ZodMiniType<
   name: z.optional(z.string()),
   apiKey: z.optional(z.string()),
   baseUrl: z.optional(z.nullable(z.string())),
-  modelOverrides: z.optional(z.nullable(Schemanullab4$outboundSchema)),
+  modelOverrides: z.optional(z.nullable(Schemanullab2$outboundSchema)),
   isActive: z.optional(z.boolean()),
   isDefault: z.optional(z.boolean()),
   family: z.optional(z.nullable(z.string())),
@@ -87,7 +87,7 @@ export const NameApiKeyBaseUrl$outboundSchema: z.ZodMiniType<
     z.nullable(z.array(IdDisplayNameFamily$outboundSchema)),
   ),
   apiVersion: z.optional(z.nullable(z.string())),
-  metadata: z.optional(z.nullable(Schemanullab4$outboundSchema)),
+  metadata: z.optional(z.nullable(Schemanullab2$outboundSchema)),
 });
 
 export function nameApiKeyBaseUrlToJSON(

package/src/models/operations/index.ts

@@ -2,112 +2,46 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-export * from "./add-experiment-result.js";
 export * from "./add-organization-member.js";
 export * from "./add-workspace-member.js";
-export * from "./bulk-create-prompt-dataset-items.js";
-export * from "./cancel-optimization.js";
 export * from "./change-password.js";
 export * from "./check-organization-slug.js";
-export * from "./clone-prompt-dataset.js";
-export * from "./complete-experiment.js";
-export * from "./create-batch-prompt-execution.js";
-export * from "./create-evaluation-version.js";
-export * from "./create-experiment.js";
 export * from "./create-invitation.js";
-export * from "./create-prompt-dataset-item.js";
-export * from "./create-prompt-dataset.js";
-export * from "./create-prompt-version.js";
 export * from "./delete-account.js";
 export * from "./delete-agent.js";
-export * from "./delete-evaluation.js";
-export * from "./delete-experiment.js";
 export * from "./delete-invitation.js";
 export * from "./delete-organization.js";
-export * from "./delete-playground-run.js";
-export * from "./delete-prompt-dataset-item.js";
-export * from "./delete-prompt-dataset.js";
-export * from "./delete-prompt-execution.js";
-export * from "./delete-prompt.js";
 export * from "./delete-provider.js";
 export * from "./delete-session.js";
-export * from "./delete-trace.js";
 export * from "./delete-workspace.js";
-export * from "./execute-experiment.js";
-export * from "./export-prompt-dataset.js";
-export * from "./export-prompt-executions.js";
 export * from "./get-agent-by-slug.js";
 export * from "./get-agent.js";
-export * from "./get-analytics-summary.js";
-export * from "./get-evaluation-history.js";
-export * from "./get-evaluation-result.js";
-export * from "./get-evaluation-results-aggregated.js";
-export * from "./get-evaluation.js";
-export * from "./get-experiment.js";
 export * from "./get-invitation.js";
 export * from "./get-models-catalog.js";
-export * from "./get-optimization-progress.js";
-export * from "./get-optimization-results.js";
-export * from "./get-optimization-states.js";
-export * from "./get-optimization.js";
 export * from "./get-organization-by-slug.js";
 export * from "./get-organization-member-count.js";
 export * from "./get-organization.js";
-export * from "./get-playground-run.js";
 export * from "./get-profile.js";
-export * from "./get-prompt-analytics.js";
-export * from "./get-prompt-dataset-item.js";
-export * from "./get-prompt-dataset.js";
-export * from "./get-prompt-execution.js";
-export * from "./get-prompt-model-comparisons.js";
-export * from "./get-prompt-readiness.js";
-export * from "./get-prompt.js";
 export * from "./get-provider.js";
-export * from "./get-trace-stats.js";
-export * from "./get-trace.js";
 export * from "./get-workspace.js";
-export * from "./ingest-otlp.js";
-export * from "./ingest-trace-batch.js";
 export * from "./list-agents.js";
 export * from "./list-available-models.js";
-export * from "./list-datasets-for-prompt.js";
-export * from "./list-evaluations.js";
-export * from "./list-experiments.js";
 export * from "./list-invitations.js";
-export * from "./list-optimizations.js";
 export * from "./list-organization-members.js";
 export * from "./list-organizations.js";
-export * from "./list-playground-runs.js";
-export * from "./list-prompt-dataset-items.js";
-export * from "./list-prompt-datasets.js";
-export * from "./list-prompt-executions.js";
-export * from "./list-prompt-versions.js";
-export * from "./list-prompts.js";
 export * from "./list-providers.js";
 export * from "./list-sessions.js";
-export * from "./list-traces.js";
 export * from "./list-workspace-members.js";
 export * from "./list-workspaces.js";
-export * from "./optimize-prompt.js";
-export * from "./pause-optimization.js";
-export * from "./playground-call.js";
-export * from "./playground-eval.js";
 export * from "./remove-organization-member.js";
 export * from "./remove-workspace-member.js";
 export * from "./resend-invitation.js";
-export * from "./resume-optimization.js";
-export * from "./run-evaluation.js";
 export * from "./set-default-workspace.js";
 export * from "./test-provider.js";
 export * from "./update-agent.js";
-export * from "./update-evaluation.js";
-export * from "./update-experiment-name.js";
 export * from "./update-organization-member.js";
 export * from "./update-organization.js";
 export * from "./update-profile.js";
-export * from "./update-prompt-dataset-item.js";
-export * from "./update-prompt-dataset.js";
-export * from "./update-prompt.js";
 export * from "./update-provider.js";
 export * from "./update-workspace-member.js";
 export * from "./update-workspace.js";

package/src/models/operations/list-available-models.ts

@@ -8,7 +8,7 @@ import { Result as SafeParseResult } from "../../types/fp.js";
 import * as types from "../../types/primitives.js";
 import { SDKValidationError } from "../errors/sdk-validation-error.js";
 
-export type ListAvailableModelsModel = {
+export type Model = {
   /**
    * Model identifier (e.g., "gpt-4o")
    */
@@ -38,7 +38,7 @@ export type ListAvailableModelsResponse = {
   /**
    * Available models from configured providers
    */
-  models: Array<ListAvailableModelsModel>;
+  models: Array<Model>;
   /**
    * Provider types that have active configurations
    */
@@ -46,10 +46,7 @@ export type ListAvailableModelsResponse = {
 };
 
 /** @internal */
-export const ListAvailableModelsModel$inboundSchema: z.ZodMiniType<
-  ListAvailableModelsModel,
-  unknown
-> = z.object({
+export const Model$inboundSchema: z.ZodMiniType<Model, unknown> = z.object({
   id: types.string(),
   name: types.string(),
   provider: types.string(),
@@ -57,13 +54,13 @@ export const ListAvailableModelsModel$inboundSchema: z.ZodMiniType<
   description: types.optional(types.string()),
 });
 
-export function listAvailableModelsModelFromJSON(
+export function modelFromJSON(
   jsonString: string,
-): SafeParseResult<ListAvailableModelsModel, SDKValidationError> {
+): SafeParseResult<Model, SDKValidationError> {
   return safeParse(
     jsonString,
-    (x) => ListAvailableModelsModel$inboundSchema.parse(JSON.parse(x)),
-    `Failed to parse 'ListAvailableModelsModel' from JSON`,
+    (x) => Model$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'Model' from JSON`,
   );
 }
 
@@ -72,7 +69,7 @@ export const ListAvailableModelsResponse$inboundSchema: z.ZodMiniType<
   ListAvailableModelsResponse,
   unknown
 > = z.object({
-  models: z.array(z.lazy(() => ListAvailableModelsModel$inboundSchema)),
+  models: z.array(z.lazy(() => Model$inboundSchema)),
   providers: z.array(types.string()),
 });
 

package/src/models/operations/update-organization-member.ts

@@ -9,7 +9,7 @@ export type UpdateOrganizationMemberRequestBody = {
   /**
    * The new role for the member
    */
-  role?: models.Schemadefaul6 | undefined;
+  role?: models.Schemadefaul | undefined;
 };
 
 export type UpdateOrganizationMemberRequest = {
@@ -29,8 +29,8 @@ export const UpdateOrganizationMemberRequestBody$outboundSchema: z.ZodMiniType<
   UpdateOrganizationMemberRequestBody
 > = z.object({
   role: z._default(
-    models.Schemadefaul6$outboundSchema,
-    models.Schemadefaul6.Owner,
+    models.Schemadefaul$outboundSchema,
+    models.Schemadefaul.Owner,
   ),
 });
 

package/src/models/operations/update-workspace-member.ts

@@ -9,7 +9,7 @@ export type UpdateWorkspaceMemberRequestBody = {
   /**
    * The new role for the member
    */
-  role?: models.Schemadefaul8 | undefined;
+  role?: models.Schemadefaul3 | undefined;
 };
 
 export type UpdateWorkspaceMemberRequest = {
@@ -29,8 +29,8 @@ export const UpdateWorkspaceMemberRequestBody$outboundSchema: z.ZodMiniType<
   UpdateWorkspaceMemberRequestBody
 > = z.object({
   role: z._default(
-    models.Schemadefaul8$outboundSchema,
-    models.Schemadefaul8.Admin,
+    models.Schemadefaul3$outboundSchema,
+    models.Schemadefaul3.Admin,
   ),
 });
 

package/src/models/provider-configs-list.ts

@@ -32,7 +32,7 @@ export type ProviderConfigsListMetadata = {};
 /**
  * Provider config object (API key is masked)
  */
-export type ProviderConfigsListConfig = {
+export type Config = {
   /**
    * Provider config unique identifier
    */
@@ -114,7 +114,7 @@ export type ProviderConfigsList = {
   /**
    * Array of provider configs
    */
-  configs: Array<ProviderConfigsListConfig>;
+  configs: Array<Config>;
   /**
    * Total number of configs
    */
@@ -176,10 +176,7 @@ export function providerConfigsListMetadataFromJSON(
 }
 
 /** @internal */
-export const ProviderConfigsListConfig$inboundSchema: z.ZodMiniType<
-  ProviderConfigsListConfig,
-  unknown
-> = z.object({
+export const Config$inboundSchema: z.ZodMiniType<Config, unknown> = z.object({
   id: types.string(),
   name: types.string(),
   provider: types.string(),
@@ -206,13 +203,13 @@ export const ProviderConfigsListConfig$inboundSchema: z.ZodMiniType<
   updatedAt: types.date(),
 });
 
-export function providerConfigsListConfigFromJSON(
+export function configFromJSON(
   jsonString: string,
-): SafeParseResult<ProviderConfigsListConfig, SDKValidationError> {
+): SafeParseResult<Config, SDKValidationError> {
   return safeParse(
     jsonString,
-    (x) => ProviderConfigsListConfig$inboundSchema.parse(JSON.parse(x)),
-    `Failed to parse 'ProviderConfigsListConfig' from JSON`,
+    (x) => Config$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'Config' from JSON`,
   );
 }
 
@@ -221,7 +218,7 @@ export const ProviderConfigsList$inboundSchema: z.ZodMiniType<
   ProviderConfigsList,
   unknown
 > = z.object({
-  configs: z.array(z.lazy(() => ProviderConfigsListConfig$inboundSchema)),
+  configs: z.array(z.lazy(() => Config$inboundSchema)),
   total: types.number(),
 });
 

package/src/models/{schemadefaul6.ts → schemadefaul.ts}

@@ -4,7 +4,7 @@
 
 import * as z from "zod/v4-mini";
 
-export enum Schemadefaul6 {
+export enum Schemadefaul {
   Owner = "owner",
   Admin = "admin",
   Editor = "editor",
@@ -12,5 +12,5 @@ export enum Schemadefaul6 {
 }
 
 /** @internal */
-export const Schemadefaul6$outboundSchema: z.ZodMiniEnum<typeof Schemadefaul6> =
-  z.enum(Schemadefaul6);
+export const Schemadefaul$outboundSchema: z.ZodMiniEnum<typeof Schemadefaul> = z
+  .enum(Schemadefaul);

package/src/models/{schemadefaul8.ts → schemadefaul3.ts}

@@ -4,12 +4,12 @@
 
 import * as z from "zod/v4-mini";
 
-export enum Schemadefaul8 {
+export enum Schemadefaul3 {
   Admin = "admin",
   Editor = "editor",
   Viewer = "viewer",
 }
 
 /** @internal */
-export const Schemadefaul8$outboundSchema: z.ZodMiniEnum<typeof Schemadefaul8> =
-  z.enum(Schemadefaul8);
+export const Schemadefaul3$outboundSchema: z.ZodMiniEnum<typeof Schemadefaul3> =
+  z.enum(Schemadefaul3);

package/src/models/schemanullab2.ts

@@ -0,0 +1,20 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod/v4-mini";
+
+export type Schemanullab2 = {};
+
+/** @internal */
+export type Schemanullab2$Outbound = {};
+
+/** @internal */
+export const Schemanullab2$outboundSchema: z.ZodMiniType<
+  Schemanullab2$Outbound,
+  Schemanullab2
+> = z.object({});
+
+export function schemanullab2ToJSON(schemanullab2: Schemanullab2): string {
+  return JSON.stringify(Schemanullab2$outboundSchema.parse(schemanullab2));
+}