Merge pull request #2 from d4rkstar/php-openai

feat(runtime/php): support for redis and openai
nuvolaris · May 11, 2024 · 7978791 · 7978791
2 parents 837e7ea + 793980a
commit 7978791
Show file tree

Hide file tree

Showing 35 changed files with 665 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Mac
 .DS_Store
 
@@ -13,6 +30,8 @@ test.out
 
 # Dependencies
 vendor/
+virtulenv/
+node_modules/
 
 # Go binary proxy
 proxy
@@ -69,7 +88,5 @@ pkg/
 .vscode/
 .task
 .env
-virtulenv/
-node_modules/
 .env
 .env.nuv
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+header:
+  license:
+    spdx-id: Apache-2.0
+    copyright-owner: Apache Software Foundation
+
+  paths-ignore:
+    - '**/*.sample'
+    - 'env.src'
+    - '.git-hooks/pre-commit'
+    - '**/_*'
+    - 'nuvroot.json'
+    - 'LICENSE'
+    - 'cert-manager.yaml'
+    - 'ingress-deploy.yaml'
+    - 'runtimes.json'
+    - '**/*.json'
+    - '**/*.service'
+    - 'update/update.ps1' 
+    - '**/mime.types'
+    - '**/*.txt'
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 version: '3'
 
 dotenv: [.env]
@@ -87,6 +104,7 @@ tasks:
     - task build-lang RT=golang PUSH="{{.PUSH}}"
     - task build-lang RT=python PUSH="{{.PUSH}}"
     - task build-lang RT=nodejs PUSH="{{.PUSH}}"
+    - task build-lang RT=php PUSH="{{.PUSH}}"
 
   build-and-push:
   - task build PUSH=y
@@ -104,12 +122,13 @@ tasks:
     dir: "runtime/{{.RT}}/{{.VER}}"
     cmds:
     - docker run -p 8080:8080 -ti --entrypoint=/bin/bash -v $PWD:/mnt -e OW_COMPILER=/mnt/bin/compile "{{.BASEIMG}}/runtime-{{.RT}}-{{.VER}}:{{.TAG}}"
+
+
 
   init:
     desc: intialize a runtime with a test
     requires: { vars: [RT, VER, T] } 
     cmds:
-    - nuv ide {{.RT}} pack A={{.RT}}/{{.T}}
     - python3 packages/invoke.py init packages/{{.RT}}/{{.T}}.zip
 
   invoke:

diff --git a/go.mod b/go.mod
@@ -1,3 +1,22 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+-->
+
 module github.com/nuvolaris/nuvolaris-runtimes-ng
 
 go 1.21.4

diff --git a/openwhisk/_test/action/.gitignore b/openwhisk/_test/action/.gitignore
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 .DS_Store
 /.build
 /Packages

diff --git a/packages/invoke.py b/packages/invoke.py
@@ -95,7 +95,7 @@ def parseArgs():
 def init(args):
     main = args.main
     artifact = args.artifact
-
+    
     if artifact and (args.binary or artifact.endswith('.zip') or artifact.endswith('tgz') or artifact.endswith('jar')):
         with open(artifact, 'rb') as fp:
             contents = fp.read()

diff --git a/packages/nodejs/ask.js b/packages/nodejs/ask.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 //--web true
 //--docker ghcr.io/nuvolaris/runtime-nodejs-v21:3.1.0-mastrogpt.2403032235
 //--param OPENAI_API_KEY $OPENAI_API_KEY

diff --git a/packages/nodejs/hello.js b/packages/nodejs/hello.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 //--web true
 //--docker ghcr.io/nuvolaris/runtime-nodejs-v21:3.1.0-mastrogpt.2402201748
 

diff --git a/packages/nodejs/multifile/hello.js b/packages/nodejs/multifile/hello.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 function hello(args) {
     let name = args['name'] || "world" 
     return `Hello, ${name}.`

diff --git a/packages/nodejs/multifile/index.js b/packages/nodejs/multifile/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 //--web true
 //--kind nodeks:default
 

diff --git a/packages/nodejs/withreqs/index.js b/packages/nodejs/withreqs/index.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 //--web true
 //--docker ghcr.io/nuvolaris/runtime-nodejs-v21:3.1.0-mastrogpt.2402201748
 

diff --git a/packages/php/hello.php b/packages/php/hello.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//--web true
+//--kind php:default
+function main(array $args): array
+{
+  $name = array_key_exists("name", $args) ? $args["name"] : "world";
+  return ['body' => sprintf('Hello %s', $name)];
+}
diff --git a/packages/php/openai.php b/packages/php/openai.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//--web true
+//--kind php:default
+//--param OPENAI_API_KEY $OPENAI_API_KEY
+//--param OPENAI_API_HOST $OPENAI_API_HOST
+function main(array $args): array
+{
+  $openaiKey = array_key_exists('OPENAI_API_KEY',$args) ? $args['OPENAI_API_KEY'] : null;
+  $openaiHost = array_key_exists('OPENAI_API_HOST',$args) ? $args['OPENAI_API_HOST'] : null;
+
+  $model = "gpt-35-turbo";
+
+  if (empty($openaiHost)) {
+    $openaiHost = 'openai.nuvolaris.io';
+  }
+  if (empty($openaiKey)) {
+    return ['error'=>"OpenAI Key is not set"];
+  }
+
+  print "Sending request to $openaiHost";
+
+  $client = OpenAI::factory()
+  ->withApiKey($openaiKey)
+  ->withBaseUri($openaiHost)
+  ->make();
+
+  $response = $client->models()->list();
+
+  /*$response = $client->chat()->create([
+    'model' => $model,
+    'messages' => [
+        ['role' => 'user', 'content' => 'Hello!'],
+    ],
+  ]);*/
+
+  return ['body' => print_r($response, true)];
+}
diff --git a/packages/php/withcomposer/composer.json b/packages/php/withcomposer/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "twig/twig": "^3.9"
+    }
+}