Merge branch 'main' of https://github.com/thirdweb-dev/js into gi/portal-translation-crowdinai

Author: GiselleNessi

apps/portal/src/app/nebula/faqs/page.mdx

@@ -4,10 +4,20 @@
 
 Estamos aprobando el acceso a Nebula en lotes diariamente. ¡Mantente atento!
 
-### ¿Nebula será de código abierto?
+### ¿Qué contratos soporta Nebula?
+Nebula soporta el contexto de lectura y escritura de cualquier contrato verificado o cualquier contrato en el panel de control de thirdweb. Para desplegar a través de Nebula, los contratos soportados incluyen [Token - ERC20](https://thirdweb.com/thirdweb.eth/TokenERC20), [Colección NFT - ERC721](https://thirdweb.com/thirdweb.eth/TokenERC721), [Edición - ERC1155](https://thirdweb.com/thirdweb.eth/TokenERC1155), y [Split](https://thirdweb.com/thirdweb.eth/Split).
+
+Si tienes un contrato publicado que te gustaría habilitar para su despliegue a través de Nebula, por favor [contáctanos](https://thirdweb.com/contact-us).
+
+### ¿Nebula tiene memoria de conversaciones pasadas?
+Nebula retiene memoria dentro de los límites de una sesión.
 
 Nebula no es actualmente de código abierto. Estamos explorando la posibilidad de hacer Nebula de código abierto en el futuro.
 
 ### ¿Cuándo estará disponible la información sobre precios para Nebula?
 
-Las opciones de precios estarán disponibles en la versión beta (estimada para mediados de enero de 2025).
+Nebula no es actualmente de código abierto. Estamos explorando la posibilidad de hacerlo en el futuro.
+
+### ¿Cuándo estará disponible la información de precios para Nebula?
+
+Las opciones de precios estarán disponibles en la versión beta. Nebula aún está siendo probada en su versión alfa.

apps/portal/src/app/nebula/plugins/openAI/page.mdx

@@ -0,0 +1,40 @@
+# OpenAI
+
+### Chat Completions API
+
+Compatible with OpenAI’s Chat Completion API to process chat history and generate context-aware responses.
+
+```python
+from openai import OpenAI
+
+client = OpenAI(
+	base_url="https://nebula-api.thirdweb.com",
+	api_key="{{THIRDWEB_SECRET_KEY}}",
+)
+chat_completion = client.chat.completions.create(
+	model="t0",
+	messages=[{"role": "user", "content": "Hello Nebula!"}],
+	stream=False,
+    extra_body={ "context": { "wallet_address": "0x..." }}
+)
+
+print(chat_completion)
+```
+
+### Models API
+
+Compatible with OpenAI’s Models API to list out models used. 
+
+```python
+from openai import OpenAI
+
+# https://nebula-api.thirdweb.com/models
+
+client = OpenAI(
+    base_url="https://nebula-api.thirdweb.com/",
+    api_key="",
+)
+
+models = client.models.list()
+print(models)
+```

apps/portal/src/app/nebula/plugins/page.mdx

@@ -2,11 +2,7 @@ import { Callout } from '@doc'
 
 # Plugins
 
+- [OpenAI](/nebula/plugins/openai)
+- [Eliza](/nebula/plugins/eliza)
 
-<Callout variant='info' title='Coming Soon'>
-
-We are actively developing plugins to develop with other frameworks and languages.
-
-If you have a specific request, please [contact us](https://thirdweb.com/contact).
-
- </Callout>
+We are actively adding more integrations, for any specific requests please [contact us](https://thirdweb.com/contact).

apps/portal/src/app/nebula/sidebar.tsx

@@ -110,10 +110,14 @@ export const sidebar: SideBar = {
       ],
     },
     {
-      name: "Plugins",
+      name: "Plugins & Integrations",
       href: "/nebula/plugins",
       icon: <Blocks />,
       links: [
+        {
+          name: "OpenAI",
+          href: "/nebula/plugins/openai",
+        },
         {
           name: "Eliza",
           href: "/nebula/plugins/eliza",

packages/service-utils/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @thirdweb-dev/service-utils
 
+## 0.8.0
+
+### Minor Changes
+
+- [#6101](https://github.com/thirdweb-dev/js/pull/6101) [`e8892b1`](https://github.com/thirdweb-dev/js/commit/e8892b152f70d3024dfbefcddcfa74a69a12bdd0) Thanks [@jnsdls](https://github.com/jnsdls)! - pass `team` instead of `project` to `rateLimit`
+
 ## 0.7.3
 
 ### Patch Changes

packages/service-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/service-utils",
-  "version": "0.7.3",
+  "version": "0.8.0",
   "type": "module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -26,12 +26,8 @@
   },
   "typesVersions": {
     "*": {
-      "node": [
-        "./dist/types/node/index.d.ts"
-      ],
-      "cf-worker": [
-        "./dist/types/cf-worker/index.d.ts"
-      ]
+      "node": ["./dist/types/node/index.d.ts"],
+      "cf-worker": ["./dist/types/cf-worker/index.d.ts"]
     }
   },
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/pay",
@@ -40,9 +36,7 @@
     "url": "https://github.com/thirdweb-dev/js/issues"
   },
   "author": "thirdweb eng <[email protected]>",
-  "files": [
-    "dist/"
-  ],
+  "files": ["dist/"],
   "sideEffects": false,
   "dependencies": {
     "aws4fetch": "1.0.20",

packages/service-utils/src/core/api.ts

@@ -164,24 +164,3 @@ export async function fetchTeamAndProject(
     );
   }
 }
-
-export async function updateRateLimitedAt(
-  projectId: string,
-  config: CoreServiceConfig,
-): Promise<void> {
-  const { apiUrl, serviceScope: scope, serviceApiKey } = config;
-
-  const url = `${apiUrl}/usage/rateLimit`;
-
-  await fetch(url, {
-    method: "PUT",
-    headers: {
-      "x-service-api-key": serviceApiKey,
-      "content-type": "application/json",
-    },
-    body: JSON.stringify({
-      apiKeyId: projectId, // projectId is the apiKeyId
-      scope,
-    }),
-  });
-}

packages/service-utils/src/core/rateLimit/index.ts

@@ -1,8 +1,4 @@
-import {
-  type CoreServiceConfig,
-  type ProjectResponse,
-  updateRateLimitedAt,
-} from "../api.js";
+import type { CoreServiceConfig, TeamResponse } from "../api.js";
 import type { RateLimitResult } from "./types.js";
 
 const RATE_LIMIT_WINDOW_SECONDS = 10;
@@ -14,7 +10,7 @@ type IRedis = {
 };
 
 export async function rateLimit(args: {
-  project?: ProjectResponse;
+  team: TeamResponse;
   limitPerSecond: number;
   serviceConfig: CoreServiceConfig;
   redis: IRedis;
@@ -25,13 +21,7 @@ export async function rateLimit(args: {
    */
   sampleRate?: number;
 }): Promise<RateLimitResult> {
-  const {
-    project,
-    limitPerSecond,
-    serviceConfig,
-    redis,
-    sampleRate = 1.0,
-  } = args;
+  const { team, limitPerSecond, serviceConfig, redis, sampleRate = 1.0 } = args;
 
   const shouldSampleRequest = Math.random() < sampleRate;
   if (!shouldSampleRequest) {
@@ -57,7 +47,7 @@ export async function rateLimit(args: {
   const timestampWindow =
     Math.floor(Date.now() / (1000 * RATE_LIMIT_WINDOW_SECONDS)) *
     RATE_LIMIT_WINDOW_SECONDS;
-  const key = `rate-limit:${serviceScope}:${project?.id}:${timestampWindow}`;
+  const key = `rate-limit:${serviceScope}:${team.id}:${timestampWindow}`;
 
   // Increment and get the current request count in this window.
   const requestCount = await redis.incr(key);
@@ -71,17 +61,6 @@ export async function rateLimit(args: {
     limitPerSecond * sampleRate * RATE_LIMIT_WINDOW_SECONDS;
 
   if (requestCount > limitPerWindow) {
-    /**
-     * Report rate limit hits.
-     * Only track rate limit when its hit for the first time.
-     * Not waiting for tracking to complete as user doesn't need to wait.
-     */
-    if (requestCount === limitPerWindow + 1 && project?.id) {
-      updateRateLimitedAt(project.id, serviceConfig).catch(() => {
-        // no-op
-      });
-    }
-
     return {
       rateLimited: true,
       requestCount,

packages/service-utils/src/core/rateLimit/rateLimit.test.ts

@@ -1,18 +1,12 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { validProjectResponse, validServiceConfig } from "../../mocks.js";
-import { updateRateLimitedAt } from "../api.js";
+import { validServiceConfig, validTeamResponse } from "../../mocks.js";
 import { rateLimit } from "./index.js";
 
 const mockRedis = {
   incr: vi.fn(),
   expire: vi.fn(),
 };
 
-// Mocking the updateRateLimitedAt function
-vi.mock("../../../src/core/api", () => ({
-  updateRateLimitedAt: vi.fn().mockResolvedValue({}),
-}));
-
 describe("rateLimit", () => {
   beforeEach(() => {
     // Clear mock function calls and reset any necessary state.
@@ -27,7 +21,7 @@ describe("rateLimit", () => {
 
   it("should not rate limit if service scope is not in rate limits", async () => {
     const result = await rateLimit({
-      project: validProjectResponse,
+      team: validTeamResponse,
       limitPerSecond: 0,
       serviceConfig: validServiceConfig,
       redis: mockRedis,
@@ -44,7 +38,7 @@ describe("rateLimit", () => {
     mockRedis.incr.mockResolvedValue(50); // Current count is 50 requests in 10 seconds.
 
     const result = await rateLimit({
-      project: validProjectResponse,
+      team: validTeamResponse,
       limitPerSecond: 5,
       serviceConfig: validServiceConfig,
       redis: mockRedis,
@@ -55,15 +49,15 @@ describe("rateLimit", () => {
       requestCount: 50,
       rateLimit: 50,
     });
-    expect(updateRateLimitedAt).not.toHaveBeenCalled();
+
     expect(mockRedis.expire).not.toHaveBeenCalled();
   });
 
   it("should rate limit if exceeded hard limit", async () => {
     mockRedis.incr.mockResolvedValue(51);
 
     const result = await rateLimit({
-      project: validProjectResponse,
+      team: validTeamResponse,
       limitPerSecond: 5,
       serviceConfig: validServiceConfig,
       redis: mockRedis,
@@ -77,15 +71,15 @@ describe("rateLimit", () => {
       errorMessage: `You've exceeded your storage rate limit at 5 reqs/sec. To get higher rate limits, contact us at https://thirdweb.com/contact-us.`,
       errorCode: "RATE_LIMIT_EXCEEDED",
     });
-    expect(updateRateLimitedAt).toHaveBeenCalled();
+
     expect(mockRedis.expire).not.toHaveBeenCalled();
   });
 
   it("expires on the first incr request only", async () => {
     mockRedis.incr.mockResolvedValue(1);
 
     const result = await rateLimit({
-      project: validProjectResponse,
+      team: validTeamResponse,
       limitPerSecond: 5,
       serviceConfig: validServiceConfig,
       redis: mockRedis,
@@ -104,7 +98,7 @@ describe("rateLimit", () => {
     vi.spyOn(global.Math, "random").mockReturnValue(0.08);
 
     const result = await rateLimit({
-      project: validProjectResponse,
+      team: validTeamResponse,
       limitPerSecond: 5,
       serviceConfig: validServiceConfig,
       redis: mockRedis,
@@ -127,7 +121,7 @@ describe("rateLimit", () => {
     vi.spyOn(global.Math, "random").mockReturnValue(0.15);
 
     const result = await rateLimit({
-      project: validProjectResponse,
+      team: validTeamResponse,
       limitPerSecond: 5,
       serviceConfig: validServiceConfig,
       redis: mockRedis,

packages/service-utils/src/index.ts

@@ -10,7 +10,7 @@ export type {
   TeamResponse,
 } from "./core/api.js";
 
-export { fetchTeamAndProject, updateRateLimitedAt } from "./core/api.js";
+export { fetchTeamAndProject } from "./core/api.js";
 
 export {
   authorizeBundleId,