Merge pull request #3512 from hey-api/refactor/playground

mrlubos · web-flow · commit f324a4ed6d0b · 2026-03-06T01:19:31.000+01:00
refactor: add python playground
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ coverage
 
 # test files
 .gen/
+dev/gen/
 test/generated
 
 # debug files
diff --git a/dev/openapi-python.config.ts b/dev/openapi-python.config.ts
@@ -14,7 +14,7 @@ export default defineConfig(() => [
       path: './logs',
     },
     output: {
-      path: path.resolve(__dirname, '.gen', 'python'),
+      path: path.resolve(__dirname, 'gen', 'python'),
     },
     plugins: getPreset(),
   },
diff --git a/dev/openapi-ts.config.ts b/dev/openapi-ts.config.ts
@@ -14,7 +14,7 @@ export default defineConfig(() => [
       path: './logs',
     },
     output: {
-      path: path.resolve(__dirname, '.gen', 'typescript'),
+      path: path.resolve(__dirname, 'gen', 'typescript'),
     },
     plugins: getPreset(),
   },
diff --git a/dev/package.json b/dev/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "ts-node ./playground.ts"
+    "dev": "tsx ./playground.ts"
   },
   "devDependencies": {
     "@angular/common": "21.1.2",
@@ -23,6 +23,7 @@
     "arktype": "2.1.29",
     "nuxt": "3.21.0",
     "swr": "2.4.0",
+    "tsx": "4.21.0",
     "typescript": "5.9.3",
     "valibot": "1.2.0",
     "vue": "3.5.25",
diff --git a/dev/playground.py b/dev/playground.py
@@ -0,0 +1,16 @@
+from gen.python import OpenCode
+
+
+def run():
+    client = OpenCode()
+    client.tui.publish()
+    # body={
+    #     "properties": {
+    #         "message": "Hello from Hey API OpenAPI TS Playground!",
+    #         "variant": "success",
+    #     },
+    #     "type": "tui.toast.show",
+    # },
+    # directory="main",
+
+run()
diff --git a/dev/playground.ts b/dev/playground.ts
@@ -1,7 +1,8 @@
 import type { DefinePlugin, IR } from '@hey-api/openapi-ts';
 
 // import { createOpencode } from '@opencode-ai/sdk';
-import { PetStore } from './.gen/typescript/sdk.gen.ts';
+import { client } from './gen/typescript/client.gen';
+import { OpenCode } from './gen/typescript/sdk.gen';
 
 type MyPluginConfig = { readonly name: 'myplugin' };
 type MyPlugin = DefinePlugin<MyPluginConfig>;
@@ -19,8 +20,11 @@ export const handler: MyPlugin['Handler'] = ({ plugin }) => {
 async function run() {
   // const { client, server } = await createOpencode();
   // console.log(client, server);
-  const client = new PetStore();
-  client.tui.publish({
+  client.setConfig({
+    baseUrl: 'https://api.example.com',
+  });
+  const sdk = new OpenCode({ client });
+  sdk.tui.publish({
     body: {
       properties: {
         message: 'Hello from Hey API OpenAPI TS Playground!',
diff --git a/dev/python/presets.ts b/dev/python/presets.ts
@@ -5,13 +5,9 @@ export const presets = {
   sdk: () => [
     /** SDK */
     sdk({
-      '~hooks': {
-        symbols: {
-          // getExportFromFilePath(symbol) {
-          //   console.log(symbol.toString());
-          //   return undefined;
-          // },
-        },
+      operations: {
+        containerName: 'OpenCode',
+        strategy: 'single',
       },
     }),
   ],
diff --git a/dev/tsconfig.json b/dev/tsconfig.json
@@ -1,11 +1,10 @@
 {
-  "extends": "../packages/openapi-ts-tests/tsconfig.base.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "allowImportingTsExtensions": true,
-    "declaration": false,
-    "esModuleInterop": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
     "noEmit": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true
+    "resolveJsonModule": true
   }
 }
diff --git a/dev/typescript/presets.ts b/dev/typescript/presets.ts
@@ -22,6 +22,7 @@ export const presets = {
         containerName: 'OpenCode',
         strategy: 'single',
       },
+      paramsStructure: 'flat',
     }),
   ],
   tanstack: () => [
diff --git a/package.json b/package.json
@@ -70,7 +70,6 @@
     "husky": "9.1.7",
     "lint-staged": "16.2.7",
     "oxfmt": "0.35.0",
-    "ts-node": "10.9.2",
     "tsdown": "0.18.4",
     "tsx": "4.21.0",
     "turbo": "2.8.12",
diff --git a/packages/openapi-python/src/plugins/@hey-api/sdk/v1/node.ts b/packages/openapi-python/src/plugins/@hey-api/sdk/v1/node.ts
@@ -73,6 +73,7 @@ function childToNode(
   return [
     $.func(memberName)
       .decorator(cachedProp)
+      .param('self')
       .returns(refChild)
       .do(
         $(refChild)
@@ -115,21 +116,9 @@ function implementFn<T extends ReturnType<typeof $.func>>(args: {
 }): T {
   const { node, operation } = args;
 
-  // Build the URL path
-  const path = operation.path;
-
-  // Get the HTTP method (default to GET)
   const method = operation.method?.toLowerCase() || 'get';
 
-  // Create the client call expression: self.client.get(path)
-  // self is the Python equivalent of 'this' for instance methods
-  const selfExpr = $.id('self');
-  const clientExpr = $.attr(selfExpr, 'client');
-  const methodExpr = $.attr(clientExpr, method);
-  const clientCall = $.call(methodExpr, $.literal(path));
-
-  // Return the client call
-  node.do($.return(clientCall));
+  node.do($('self').attr('client').attr(method).call($.literal(operation.path)).return());
 
   return node;
 }
@@ -177,7 +166,7 @@ export function toNode(
             operation,
             plugin,
           }),
-        ),
+        ).param('self'),
         operation,
         plugin,
       });
diff --git a/packages/openapi-ts-tests/main/package.json b/packages/openapi-ts-tests/main/package.json
@@ -40,7 +40,6 @@
     "nuxt": "3.14.1592",
     "ofetch": "1.5.1",
     "rxjs": "7.8.2",
-    "ts-node": "10.9.2",
     "tslib": "2.8.1",
     "typescript": "5.9.3",
     "valibot": "1.2.0",
diff --git a/packages/shared/src/plugins/shared/utils/instance.ts b/packages/shared/src/plugins/shared/utils/instance.ts
@@ -39,6 +39,7 @@ type ResolvedNode = 'Node' extends keyof PluginInstanceTypes
     PluginInstanceTypes['Node']
   : Node;
 
+// TODO: abstract
 const defaultGetFilePath = (symbol: Symbol): string | undefined => {
   if (!symbol.meta?.pluginName || typeof symbol.meta.pluginName !== 'string') {
     return;
@@ -49,6 +50,9 @@ const defaultGetFilePath = (symbol: Symbol): string | undefined => {
   if (symbol.meta.pluginName === '@hey-api/typescript') {
     return 'types';
   }
+  if (symbol.meta.pluginName === '@hey-api/python-sdk') {
+    return 'sdk';
+  }
   if (symbol.meta.pluginName.startsWith('@hey-api/')) {
     return symbol.meta.pluginName.split('/')[1];
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`{`
`2`		`- "extends": "../packages/openapi-ts-tests/tsconfig.base.json",`
	`2`	`+ "extends": "../tsconfig.base.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"allowImportingTsExtensions": true,`
`5`		`- "declaration": false,`
`6`		`- "esModuleInterop": true,`
	`5`	`+ "module": "ESNext",`
	`6`	`+ "moduleResolution": "bundler",`
`7`	`7`	`"noEmit": true,`
`8`		`- "resolveJsonModule": true,`
`9`		`- "skipLibCheck": true`
	`8`	`+ "resolveJsonModule": true`
`10`	`9`	`}`
`11`	`10`	`}`