Skip to content

Commit 8247be9

Browse files
committed
Merge branch 'layer-restructure' as 0.7.0
2 parents ce25abd + 2fb2360 commit 8247be9

File tree

346 files changed

+5262
-16234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

346 files changed

+5262
-16234
lines changed

.editorconfig

Lines changed: 1123 additions & 7 deletions
Large diffs are not rendered by default.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Perper Dotnet Agent
2+
3+
on:
4+
push:
5+
paths:
6+
- 'agent/dotnet/src/Perper/**'
7+
branches:
8+
- master
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v1
16+
17+
- uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: '5.0.x'
20+
21+
- name: Build with dotnet
22+
working-directory: ./agent/dotnet/src/Perper
23+
run: dotnet build --configuration Release
24+
25+
- name: Push generated package to nuget.org
26+
working-directory: ./agent/dotnet/src/Perper/bin/Release
27+
run: dotnet nuget push *.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate

.github/workflows/perper-python-binding.yml renamed to .github/workflows/perper-agent-python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: Perper Python Binding
1+
name: Perper Python Agent
22

33
on:
44
push:
55
paths:
6-
- 'functions/python/**'
6+
- 'agent/python/**'
77
branches:
88
- master
99

@@ -19,12 +19,12 @@ jobs:
1919
with:
2020
python-version: '3.x'
2121
- name: Install dependencies
22-
working-directory: ./functions/python
22+
working-directory: ./agent/python
2323
run: |
2424
python -m pip install --upgrade pip
2525
pip install setuptools wheel twine
2626
- name: Build and publish
27-
working-directory: ./functions/python
27+
working-directory: ./agent/python
2828
env:
2929
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
3030
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

.github/workflows/perper-functions.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
**/build
88
**/dist
99
**/*.egg-info
10+
.eggs/
1011
.vscode/*
1112

1213
venv
@@ -17,4 +18,6 @@ venv
1718

1819
/*.DotSettings.user
1920
.vscode/settings.json
20-
samples/PythonNotebook/jupyter_command.bat
21+
samples/PythonNotebook/jupyter_command.bat
22+
/cli/perper.exe
23+
/packages

Perper.sln

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Custom.FunctionApp", "sampl
3333
EndProject
3434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "samples\ConsoleApp1\ConsoleApp1.csproj", "{42D874EF-8467-4276-8F69-0FFE2C4D5837}"
3535
EndProject
36-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAgent", "samples\simple-agent\src\SimpleAgent\SimpleAgent.csproj", "{29BFDC2C-9969-4FE5-B294-8203A2675804}"
37-
EndProject
38-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simple-agent", "simple-agent", "{57371717-4EA6-4E88-8C96-3CC486E4EB10}"
36+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simple-agent-azure-functions", "simple-agent-azure-functions", "{57371717-4EA6-4E88-8C96-3CC486E4EB10}"
3937
EndProject
4038
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E8B2046D-1D11-4AE3-8C65-761E3EC0F8FA}"
4139
EndProject
4240
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2724D8E7-2306-4DDD-9ECF-36504B7F9A7B}"
4341
EndProject
44-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAgent.UnitTests", "samples\simple-agent\tests\SimpleAgent.UnitTests\SimpleAgent.UnitTests.csproj", "{A4FAE3F8-8FF9-4629-BE97-2E238D507F77}"
42+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simple-agent-perper-context", "simple-agent-perper-context", "{780EA5EB-881B-4ED3-9D74-E40CCDB93FFD}"
4543
EndProject
46-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "alice-bob", "alice-bob", "{1381A50E-25E5-4CA4-B0C4-755130ED4123}"
44+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{56E59C54-E3A7-483E-A9B1-22528BD1D499}"
4745
EndProject
48-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F47BFD77-FCE2-457A-B89F-A8FD1EBCAB3F}"
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAgent", "samples\simple-agent-azure-functions\src\SimpleAgent\SimpleAgent.csproj", "{AF3E4C29-A47B-4D22-B7A7-31EAE9BEAFC5}"
4947
EndProject
50-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alice", "samples\alice-bob\src\Alice\Alice.csproj", "{131B428D-FEC6-458C-B8DA-AB7591B27C06}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAgent.UnitTests", "samples\simple-agent-azure-functions\tests\SimpleAgent.UnitTests\SimpleAgent.UnitTests.csproj", "{4EB2FAB2-5712-40EB-8001-D9A8F2C6E760}"
5149
EndProject
52-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bob", "samples\alice-bob\src\Bob\Bob.csproj", "{D7CE5E8E-7D53-42B1-955B-2528979E466F}"
50+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleAgent", "samples\simple-agent-perper-context\src\SimpleAgent\SimpleAgent.csproj", "{9BABDB0B-23AB-4211-BEA0-71283BFFB397}"
5351
EndProject
5452
Global
5553
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -93,22 +91,18 @@ Global
9391
{42D874EF-8467-4276-8F69-0FFE2C4D5837}.Debug|Any CPU.Build.0 = Debug|Any CPU
9492
{42D874EF-8467-4276-8F69-0FFE2C4D5837}.Release|Any CPU.ActiveCfg = Release|Any CPU
9593
{42D874EF-8467-4276-8F69-0FFE2C4D5837}.Release|Any CPU.Build.0 = Release|Any CPU
96-
{29BFDC2C-9969-4FE5-B294-8203A2675804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97-
{29BFDC2C-9969-4FE5-B294-8203A2675804}.Debug|Any CPU.Build.0 = Debug|Any CPU
98-
{29BFDC2C-9969-4FE5-B294-8203A2675804}.Release|Any CPU.ActiveCfg = Release|Any CPU
99-
{29BFDC2C-9969-4FE5-B294-8203A2675804}.Release|Any CPU.Build.0 = Release|Any CPU
100-
{A4FAE3F8-8FF9-4629-BE97-2E238D507F77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
101-
{A4FAE3F8-8FF9-4629-BE97-2E238D507F77}.Debug|Any CPU.Build.0 = Debug|Any CPU
102-
{A4FAE3F8-8FF9-4629-BE97-2E238D507F77}.Release|Any CPU.ActiveCfg = Release|Any CPU
103-
{A4FAE3F8-8FF9-4629-BE97-2E238D507F77}.Release|Any CPU.Build.0 = Release|Any CPU
104-
{131B428D-FEC6-458C-B8DA-AB7591B27C06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105-
{131B428D-FEC6-458C-B8DA-AB7591B27C06}.Debug|Any CPU.Build.0 = Debug|Any CPU
106-
{131B428D-FEC6-458C-B8DA-AB7591B27C06}.Release|Any CPU.ActiveCfg = Release|Any CPU
107-
{131B428D-FEC6-458C-B8DA-AB7591B27C06}.Release|Any CPU.Build.0 = Release|Any CPU
108-
{D7CE5E8E-7D53-42B1-955B-2528979E466F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
109-
{D7CE5E8E-7D53-42B1-955B-2528979E466F}.Debug|Any CPU.Build.0 = Debug|Any CPU
110-
{D7CE5E8E-7D53-42B1-955B-2528979E466F}.Release|Any CPU.ActiveCfg = Release|Any CPU
111-
{D7CE5E8E-7D53-42B1-955B-2528979E466F}.Release|Any CPU.Build.0 = Release|Any CPU
94+
{AF3E4C29-A47B-4D22-B7A7-31EAE9BEAFC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95+
{AF3E4C29-A47B-4D22-B7A7-31EAE9BEAFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
96+
{AF3E4C29-A47B-4D22-B7A7-31EAE9BEAFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{AF3E4C29-A47B-4D22-B7A7-31EAE9BEAFC5}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{4EB2FAB2-5712-40EB-8001-D9A8F2C6E760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99+
{4EB2FAB2-5712-40EB-8001-D9A8F2C6E760}.Debug|Any CPU.Build.0 = Debug|Any CPU
100+
{4EB2FAB2-5712-40EB-8001-D9A8F2C6E760}.Release|Any CPU.ActiveCfg = Release|Any CPU
101+
{4EB2FAB2-5712-40EB-8001-D9A8F2C6E760}.Release|Any CPU.Build.0 = Release|Any CPU
102+
{9BABDB0B-23AB-4211-BEA0-71283BFFB397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103+
{9BABDB0B-23AB-4211-BEA0-71283BFFB397}.Debug|Any CPU.Build.0 = Debug|Any CPU
104+
{9BABDB0B-23AB-4211-BEA0-71283BFFB397}.Release|Any CPU.ActiveCfg = Release|Any CPU
105+
{9BABDB0B-23AB-4211-BEA0-71283BFFB397}.Release|Any CPU.Build.0 = Release|Any CPU
112106
EndGlobalSection
113107
GlobalSection(SolutionProperties) = preSolution
114108
HideSolutionNode = FALSE
@@ -127,15 +121,14 @@ Global
127121
{F3188C2F-294E-4B1A-82D0-FD93AED0A717} = {EE3DCED0-30E2-4E5D-9407-7F057AFDE5CA}
128122
{A959640D-0218-4851-AA5F-649250C92688} = {5EB01B9B-538D-4FC8-8FBC-90409087ED75}
129123
{42D874EF-8467-4276-8F69-0FFE2C4D5837} = {4EFF2890-070B-4232-9240-6C824AFD0A7A}
130-
{29BFDC2C-9969-4FE5-B294-8203A2675804} = {E8B2046D-1D11-4AE3-8C65-761E3EC0F8FA}
131124
{57371717-4EA6-4E88-8C96-3CC486E4EB10} = {5EB01B9B-538D-4FC8-8FBC-90409087ED75}
132125
{E8B2046D-1D11-4AE3-8C65-761E3EC0F8FA} = {57371717-4EA6-4E88-8C96-3CC486E4EB10}
133126
{2724D8E7-2306-4DDD-9ECF-36504B7F9A7B} = {57371717-4EA6-4E88-8C96-3CC486E4EB10}
134-
{A4FAE3F8-8FF9-4629-BE97-2E238D507F77} = {2724D8E7-2306-4DDD-9ECF-36504B7F9A7B}
135-
{1381A50E-25E5-4CA4-B0C4-755130ED4123} = {5EB01B9B-538D-4FC8-8FBC-90409087ED75}
136-
{F47BFD77-FCE2-457A-B89F-A8FD1EBCAB3F} = {1381A50E-25E5-4CA4-B0C4-755130ED4123}
137-
{131B428D-FEC6-458C-B8DA-AB7591B27C06} = {F47BFD77-FCE2-457A-B89F-A8FD1EBCAB3F}
138-
{D7CE5E8E-7D53-42B1-955B-2528979E466F} = {F47BFD77-FCE2-457A-B89F-A8FD1EBCAB3F}
127+
{780EA5EB-881B-4ED3-9D74-E40CCDB93FFD} = {5EB01B9B-538D-4FC8-8FBC-90409087ED75}
128+
{56E59C54-E3A7-483E-A9B1-22528BD1D499} = {780EA5EB-881B-4ED3-9D74-E40CCDB93FFD}
129+
{AF3E4C29-A47B-4D22-B7A7-31EAE9BEAFC5} = {E8B2046D-1D11-4AE3-8C65-761E3EC0F8FA}
130+
{4EB2FAB2-5712-40EB-8001-D9A8F2C6E760} = {2724D8E7-2306-4DDD-9ECF-36504B7F9A7B}
131+
{9BABDB0B-23AB-4211-BEA0-71283BFFB397} = {56E59C54-E3A7-483E-A9B1-22528BD1D499}
139132
EndGlobalSection
140133
GlobalSection(ExtensibilityGlobals) = postSolution
141134
SolutionGuid = {A22B7103-08F7-4159-B4F9-076375D08D7A}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ project language.
8787
#### C#
8888

8989
The first step is to define Launcher function that creates the stream graph
90-
that will be executed:
90+
that will be executed:
9191

9292
*Launcher*
9393
```csharp

agent/dotnet/Perper.sln

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31321.278
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{384E1F8B-CA65-42C0-83B4-1E7D002A3A14}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAgent", "src\SimpleAgent\SimpleAgent.csproj", "{370B6DC5-2102-4490-8442-3AA20A422AE2}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{26E3FDDA-9AB4-4ADB-B0F5-8A8C6C91E9DD}"
11+
ProjectSection(SolutionItems) = preProject
12+
..\..\.editorconfig = ..\..\.editorconfig
13+
EndProjectSection
14+
EndProject
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perper", "src\Perper\Perper.csproj", "{4E64E360-3BD5-4B40-A48F-3092DE7CC55A}"
16+
EndProject
17+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleContainerAgent", "src\SimpleContainerAgent\SimpleContainerAgent.csproj", "{8D1E2D83-C79C-417D-9FC5-6943CC7182BA}"
18+
EndProject
19+
Global
20+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
21+
Debug|Any CPU = Debug|Any CPU
22+
Release|Any CPU = Release|Any CPU
23+
EndGlobalSection
24+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25+
{370B6DC5-2102-4490-8442-3AA20A422AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{370B6DC5-2102-4490-8442-3AA20A422AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{370B6DC5-2102-4490-8442-3AA20A422AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
28+
{370B6DC5-2102-4490-8442-3AA20A422AE2}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{4E64E360-3BD5-4B40-A48F-3092DE7CC55A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{4E64E360-3BD5-4B40-A48F-3092DE7CC55A}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{4E64E360-3BD5-4B40-A48F-3092DE7CC55A}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{4E64E360-3BD5-4B40-A48F-3092DE7CC55A}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{8D1E2D83-C79C-417D-9FC5-6943CC7182BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{8D1E2D83-C79C-417D-9FC5-6943CC7182BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{8D1E2D83-C79C-417D-9FC5-6943CC7182BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{8D1E2D83-C79C-417D-9FC5-6943CC7182BA}.Release|Any CPU.Build.0 = Release|Any CPU
37+
EndGlobalSection
38+
GlobalSection(SolutionProperties) = preSolution
39+
HideSolutionNode = FALSE
40+
EndGlobalSection
41+
GlobalSection(NestedProjects) = preSolution
42+
{370B6DC5-2102-4490-8442-3AA20A422AE2} = {384E1F8B-CA65-42C0-83B4-1E7D002A3A14}
43+
{4E64E360-3BD5-4B40-A48F-3092DE7CC55A} = {384E1F8B-CA65-42C0-83B4-1E7D002A3A14}
44+
{8D1E2D83-C79C-417D-9FC5-6943CC7182BA} = {384E1F8B-CA65-42C0-83B4-1E7D002A3A14}
45+
EndGlobalSection
46+
GlobalSection(ExtensibilityGlobals) = postSolution
47+
SolutionGuid = {7E949E8B-0EC2-4DFC-B593-ECD9454D5579}
48+
EndGlobalSection
49+
EndGlobal

0 commit comments

Comments
 (0)