Merge pull request #133 from pkuehnel/develop

Develop

.github/workflows/alphaRelease.yml

@@ -42,7 +42,7 @@ jobs:
         push: true
         tags: pkuehnel/smartteslaampsetter:alpha
 
-  SmaEnergymeterplugin:
+  SmaEnergymeterPlugin:
     name: Building SMAPlugin Image
     runs-on: ubuntu-latest
 
@@ -70,3 +70,32 @@ jobs:
         platforms: linux/amd64,linux/arm64,linux/arm/v7
         push: true
         tags: pkuehnel/smartteslaampsettersmaplugin:alpha
+
+  SolarEdgePlugin:
+    name: Building SolarEdgePlugin Image
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+
+    - name: Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: DockerHub login
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASS}}
+
+    - name: Build and push SolarEdgePlugin
+      uses: docker/build-push-action@v2
+      with:
+        file: ./Plugins.SolarEdge/Dockerfile
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        push: true
+        tags: pkuehnel/smartteslaampsettersolaredgeplugin:alpha

.github/workflows/edgeRelease.yml

@@ -44,7 +44,7 @@ jobs:
         push: true
         tags: pkuehnel/smartteslaampsetter:edge
 
-  SmaEnergymeterplugin:
+  SmaEnergymeterPlugin:
     name: Building SMAPlugin Image
     runs-on: ubuntu-latest
 
@@ -72,3 +72,32 @@ jobs:
         platforms: linux/amd64,linux/arm64,linux/arm/v7
         push: true
         tags: pkuehnel/smartteslaampsettersmaplugin:edge
+
+  SolarEdgePlugin:
+    name: Building SolarEdgePlugin Image
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+
+    - name: Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: DockerHub login
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASS}}
+
+    - name: Build and push SolarEdgePlugin
+      uses: docker/build-push-action@v2
+      with:
+        file: ./Plugins.SolarEdge/Dockerfile
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        push: true
+        tags: pkuehnel/smartteslaampsettersolaredgeplugin:edge

.github/workflows/versionRelease.yml

@@ -72,6 +72,22 @@ jobs:
           # Delete output directory
           rm -r "$release_name"
 
+      - name: Build Plugins.SolarEdge
+        shell: bash
+        run: |
+          # Define some variables for things we need
+          tag=$(git describe --tags --abbrev=0)
+          release_name="Plugins.SolarEdge-$tag-${{ matrix.kind }}"
+
+          # Build everything
+          dotnet publish Plugins.SolarEdge/Plugins.SolarEdge.csproj --runtime "${{ matrix.kind }}" -c Release -o "$release_name"
+
+          # Pack files
+          tar czvf "${release_name}.tar.gz" "$release_name"
+
+          # Delete output directory
+          rm -r "$release_name"
+
       - name: Publish
         uses: softprops/action-gh-release@v1
         with:
@@ -157,4 +173,44 @@ jobs:
           file: ./Plugins.SmaEnergymeter/Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
+          tags: ${{ steps.meta.outputs.tags }}
+
+  releaseDockerLatestSolarEdgeplugin:
+    name: Building SolarEdgePlugin Image
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            pkuehnel/smartteslaampsettersolaredgeplugin
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=semver,pattern={{version}}
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: DockerHub login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASS}}
+
+      - name: Build and push SolarEdgePlugin
+        uses: docker/build-push-action@v2
+        with:
+          file: ./Plugins.SolarEdge/Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
           tags: ${{ steps.meta.outputs.tags }}

Plugins.SmaEnergymeter/SharedValues.cs

@@ -1,6 +1,4 @@
-using Plugins.SmaEnergymeter.Dtos;
-
-namespace Plugins.SmaEnergymeter;
+namespace Plugins.SmaEnergymeter;
 
 public class SharedValues
 {

Plugins.SmaEnergymeter/appsettings.json

@@ -13,7 +13,10 @@
     },
     "WriteTo": [
       {
-        "Name": "Console"
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff} {Level:u3} {SourceContext}] {Message:lj}{NewLine}{Exception}"
+        }
       }
     ],
     "Enrich": [

Plugins.SolarEdge/Contracts/ICurrentValuesService.cs

@@ -0,0 +1,7 @@
+namespace Plugins.SolarEdge.Contracts;
+
+public interface ICurrentValuesService
+{
+    Task<int> GetCurrentPowerToGrid();
+    Task<int> GetInverterPower();
+}

Plugins.SolarEdge/Controllers/CurrentValuesController.cs

@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Mvc;
+using Plugins.SolarEdge.Contracts;
+
+namespace Plugins.SolarEdge.Controllers;
+
+[Route("api/[controller]/[action]")]
+[ApiController]
+public class CurrentValuesController : ControllerBase
+{
+    private readonly ICurrentValuesService _currentValuesService;
+
+    public CurrentValuesController(ICurrentValuesService currentValuesService)
+    {
+        _currentValuesService = currentValuesService;
+    }
+
+    [HttpGet]
+    public Task<int> GetPowerToGrid()
+    {
+        return _currentValuesService.GetCurrentPowerToGrid();
+    }
+
+    [HttpGet]
+    public Task<int> GetInverterPower()
+    {
+        return _currentValuesService.GetInverterPower();
+    }
+}

Plugins.SolarEdge/Dockerfile

@@ -0,0 +1,22 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-amd64 AS build
+WORKDIR /src
+COPY ["Plugins.SolarEdge/Plugins.SolarEdge.csproj", "Plugins.SolarEdge/"]
+RUN dotnet restore "Plugins.SolarEdge/Plugins.SolarEdge.csproj"
+COPY . .
+WORKDIR "/src/Plugins.SolarEdge"
+RUN dotnet build "Plugins.SolarEdge.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "Plugins.SolarEdge.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "Plugins.SolarEdge.dll"]

Plugins.SolarEdge/Dtos/CloudApi/CloudApiValue.cs

@@ -0,0 +1,8 @@
+namespace Plugins.SolarEdge.Dtos.CloudApi;
+
+// CloudApiValue myDeserializedClass = JsonConvert.DeserializeObject<CloudApiValue>(myJsonResponse);
+
+public class CloudApiValue
+{
+    public SiteCurrentPowerFlow SiteCurrentPowerFlow { get; set; }
+}

Plugins.SolarEdge/Dtos/CloudApi/Connection.cs

@@ -0,0 +1,7 @@
+namespace Plugins.SolarEdge.Dtos.CloudApi;
+
+public class Connection
+{
+    public string From { get; set; }
+    public string To { get; set; }
+}

Plugins.SolarEdge/Dtos/CloudApi/GRID.cs

@@ -0,0 +1,7 @@
+namespace Plugins.SolarEdge.Dtos.CloudApi;
+
+public class Grid
+{
+    public string Status { get; set; }
+    public double CurrentPower { get; set; }
+}

Plugins.SolarEdge/Dtos/CloudApi/LOAD.cs

@@ -0,0 +1,7 @@
+namespace Plugins.SolarEdge.Dtos.CloudApi;
+
+public class Load
+{
+    public string Status { get; set; }
+    public double CurrentPower { get; set; }
+}

Plugins.SolarEdge/Dtos/CloudApi/PV.cs

@@ -0,0 +1,7 @@
+namespace Plugins.SolarEdge.Dtos.CloudApi;
+
+public class Pv
+{
+    public string Status { get; set; }
+    public double CurrentPower { get; set; }
+}

Plugins.SolarEdge/Dtos/CloudApi/STORAGE.cs

@@ -0,0 +1,9 @@
+namespace Plugins.SolarEdge.Dtos.CloudApi;
+
+public class Storage
+{
+    public string Status { get; set; }
+    public double CurrentPower { get; set; }
+    public int ChargeLevel { get; set; }
+    public bool Critical { get; set; }
+}

Plugins.SolarEdge/Dtos/CloudApi/SiteCurrentPowerFlow.cs

@@ -0,0 +1,12 @@
+namespace Plugins.SolarEdge.Dtos.CloudApi;
+
+public class SiteCurrentPowerFlow
+{
+    public int UpdateRefreshRate { get; set; }
+    public string Unit { get; set; }
+    public List<Connection> Connections { get; set; }
+    public Grid Grid { get; set; }
+    public Load Load { get; set; }
+    public Pv Pv { get; set; }
+    public Storage Storage { get; set; }
+}

Plugins.SolarEdge/Plugins.SolarEdge.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Controllers\" />
+  </ItemGroup>
+
+</Project>

Plugins.SolarEdge/Program.cs

@@ -0,0 +1,45 @@
+using Plugins.SolarEdge;
+using Plugins.SolarEdge.Contracts;
+using Plugins.SolarEdge.Services;
+using Serilog;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.AddControllers();
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+builder.Services.AddSingleton<SharedValues>();
+builder.Services.AddTransient<ICurrentValuesService, CurrentValuesService>()
+    ;
+
+builder.Host.UseSerilog((context, configuration) => configuration
+    .ReadFrom.Configuration(context.Configuration));
+
+builder.Configuration
+    .AddJsonFile("appsettings.json")
+    .AddEnvironmentVariables();
+
+var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+if (environment == "Development")
+{
+    builder.Configuration.AddJsonFile("appsettings.Development.json");
+}
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();