Reorganize project structure

QuantConnect · Apr 5, 2024 · 8e0d967 · 8e0d967
1 parent 9684df3
commit 8e0d967
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 164 deletions.
diff --git a/.github/workflows/gh-actions.yml b/.github/workflows/gh-actions.yml
@@ -44,4 +44,4 @@ jobs:
             # Build
             dotnet build /p:Configuration=Release /v:quiet /p:WarningLevel=1 QuantConnect.DataSource.FactSet.sln
             # Run Tests
-            dotnet test ./tests/bin/Release/net6.0/QuantConnect.DataLibrary.Tests.dll
+            dotnet test ./QuantConnect.FactSet.Tests/bin/Release/net6.0/QuantConnect.DataLibrary.Tests.dll
diff --git a/DataProcessing/DataProcessing.csproj b/DataProcessing/DataProcessing.csproj
@@ -6,7 +6,7 @@
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 	</PropertyGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\QuantConnect.DataSource.csproj" />
+		<ProjectReference Include="..\QuantConnect.FactSet\QuantConnect.DataSource.FactSet.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Remove="config.json" />

diff --git a/DataProcessing/FactSetDataProcessor.cs b/DataProcessing/FactSetDataProcessor.cs
@@ -16,11 +16,10 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using QuantConnect.Data;
+using QuantConnect.Lean.DataSource.FactSet;
 using QuantConnect.Logging;
 using QuantConnect.Util;
 

diff --git a/DropboxDownloader.py b/DropboxDownloader.py
diff --git a/QuantConnect.DataSource.FactSet.sln b/QuantConnect.DataSource.FactSet.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuantConnect.DataSource", "QuantConnect.DataSource.csproj", "{FBA4214D-0148-41A9-9C9E-42F17305578F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuantConnect.FactSet", "QuantConnect.FactSet\QuantConnect.DataSource.FactSet.csproj", "{FBA4214D-0148-41A9-9C9E-42F17305578F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataProcessing", "DataProcessing\DataProcessing.csproj", "{0CE7E210-7ECF-426E-9751-5FB515EC91DA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "tests\Tests.csproj", "{078083C8-B501-44C5-A708-DA93BAA31A0A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuantConnect.FactSet.Tests", "QuantConnect.FactSet.Tests\QuantConnect.FactSet.Tests.csproj", "{078083C8-B501-44C5-A708-DA93BAA31A0A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuantConnect.Tests", "..\Lean\Tests\QuantConnect.Tests.csproj", "{D6AA5B05-7897-4B6E-AE64-45A8CBF11D8C}"
 EndProject

diff --git a/QuantConnect.DataSource.csproj b/QuantConnect.DataSource.csproj
diff --git a/tests/FactSetDataDownloaderTests.cs → ...ctSet.Tests/FactSetDataDownloaderTests.cs b/tests/FactSetDataDownloaderTests.cs → ...ctSet.Tests/FactSetDataDownloaderTests.cs
diff --git a/tests/FactSetDataProviderHistoryTests.cs → ....Tests/FactSetDataProviderHistoryTests.cs b/tests/FactSetDataProviderHistoryTests.cs → ....Tests/FactSetDataProviderHistoryTests.cs
diff --git a/tests/FactSetOptionChainProviderTests.cs → ....Tests/FactSetOptionChainProviderTests.cs b/tests/FactSetOptionChainProviderTests.cs → ....Tests/FactSetOptionChainProviderTests.cs
diff --git a/tests/FactSetSymbolMapperTests.cs → ...FactSet.Tests/FactSetSymbolMapperTests.cs b/tests/FactSetSymbolMapperTests.cs → ...FactSet.Tests/FactSetSymbolMapperTests.cs
diff --git a/tests/Tests.csproj → ...t.Tests/QuantConnect.FactSet.Tests.csproj b/tests/Tests.csproj → ...t.Tests/QuantConnect.FactSet.Tests.csproj
@@ -15,7 +15,7 @@
 		<PackageReference Include="QuantConnect.Algorithm" Version="2.5.*" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\QuantConnect.DataSource.csproj" />
+		<ProjectReference Include="..\QuantConnect.FactSet\QuantConnect.DataSource.FactSet.csproj" />
 		<ProjectReference Include="..\..\Lean\Tests\QuantConnect.Tests.csproj" />
 	</ItemGroup>
 	<ItemGroup>

diff --git a/tests/TestSetup.cs → QuantConnect.FactSet.Tests/TestSetup.cs b/tests/TestSetup.cs → QuantConnect.FactSet.Tests/TestSetup.cs
diff --git a/tests/config.json → QuantConnect.FactSet.Tests/config.json b/tests/config.json → QuantConnect.FactSet.Tests/config.json
diff --git a/FactSetApi.cs → QuantConnect.FactSet/FactSetApi.cs b/FactSetApi.cs → QuantConnect.FactSet/FactSetApi.cs
diff --git a/FactSetDataDownloader.cs → ...tConnect.FactSet/FactSetDataDownloader.cs b/FactSetDataDownloader.cs → ...tConnect.FactSet/FactSetDataDownloader.cs
diff --git a/...ng/FactSetDataProcessingDataDownloader.cs → ...et/FactSetDataProcessingDataDownloader.cs b/...ng/FactSetDataProcessingDataDownloader.cs → ...et/FactSetDataProcessingDataDownloader.cs
@@ -13,11 +13,12 @@
  * limitations under the License.
 */
 
-using QuantConnect.Lean.DataSource.FactSet;
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
+
+using FactSetSDK = FactSet.SDK;
 
-namespace QuantConnect.DataProcessing
+namespace QuantConnect.Lean.DataSource.FactSet
 {
     /// <summary>
     /// The only purpose of this class is to provide a way to access the <see cref="FactSetDataDownloader"/> class and use its constructor
@@ -27,12 +28,12 @@ namespace QuantConnect.DataProcessing
     /// without exposing its additional capabilities of storing the raw data downloaded from FactSet, which is only useful
     /// for the Data Processing program.
     /// </summary>
-    internal class FactSetDataProcessingDataDownloader : FactSetDataDownloader
+    public class FactSetDataProcessingDataDownloader : FactSetDataDownloader
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FactSetDataProcessingDataDownloader"/>
         /// </summary>
-        public FactSetDataProcessingDataDownloader(FactSet.SDK.Utils.Authentication.Configuration factSetAuthConfiguration, string rawDataFolder)
+        public FactSetDataProcessingDataDownloader(FactSetSDK.Utils.Authentication.Configuration factSetAuthConfiguration, string rawDataFolder)
             : base(new FactSetDataProcessingDataProvider(factSetAuthConfiguration, rawDataFolder))
         {
         }

diff --git a/...sing/FactSetDataProcessingDataProvider.cs → ...tSet/FactSetDataProcessingDataProvider.cs b/...sing/FactSetDataProcessingDataProvider.cs → ...tSet/FactSetDataProcessingDataProvider.cs
@@ -13,9 +13,9 @@
  * limitations under the License.
 */
 
-using QuantConnect.Lean.DataSource.FactSet;
+using FactSetSDK = FactSet.SDK;
 
-namespace QuantConnect.DataProcessing
+namespace QuantConnect.Lean.DataSource.FactSet
 {
     /// <summary>
     /// The only purpose of this class is to provide a way to access the <see cref="FactSetDataProvider"/> class and use its constructor
@@ -25,12 +25,12 @@ namespace QuantConnect.DataProcessing
     /// without exposing its additional capabilities of storing the raw data downloaded from FactSet, which is only useful
     /// for the Data Processing program.
     /// </summary>
-    internal class FactSetDataProcessingDataProvider : FactSetDataProvider
+    public class FactSetDataProcessingDataProvider : FactSetDataProvider
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FactSetDataProcessingDataProvider"/>
         /// </summary>
-        public FactSetDataProcessingDataProvider(FactSet.SDK.Utils.Authentication.Configuration factSetAuthConfig, string rawDataFolder)
+        public FactSetDataProcessingDataProvider(FactSetSDK.Utils.Authentication.Configuration factSetAuthConfig, string rawDataFolder)
             : base(factSetAuthConfig, rawDataFolder)
         {
         }

diff --git a/FactSetDataProvider.cs → QuantConnect.FactSet/FactSetDataProvider.cs b/FactSetDataProvider.cs → QuantConnect.FactSet/FactSetDataProvider.cs
diff --git a/FactSetOptionChainProvider.cs → ...ect.FactSet/FactSetOptionChainProvider.cs b/FactSetOptionChainProvider.cs → ...ect.FactSet/FactSetOptionChainProvider.cs
diff --git a/FactSetSymbolMapper.cs → QuantConnect.FactSet/FactSetSymbolMapper.cs b/FactSetSymbolMapper.cs → QuantConnect.FactSet/FactSetSymbolMapper.cs
diff --git a/QuantConnect.FactSet/QuantConnect.DataSource.FactSet.csproj b/QuantConnect.FactSet/QuantConnect.DataSource.FactSet.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<TargetFramework>net6.0</TargetFramework>
+		<Product>QuantConnect.Lean.DataSource.FactSet</Product>
+		<AssemblyName>QuantConnect.Lean.DataSource.FactSet</AssemblyName>
+		<RootNamespace>QuantConnect.Lean.DataSource.FactSet</RootNamespace>
+		<AssemblyTitle>QuantConnect.Lean.DataSource.FactSet</AssemblyTitle>
+		<OutputType>Library</OutputType>
+		<OutputPath>bin\$(Configuration)\</OutputPath>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<Description>QuantConnect LEAN FactSet Data Source: FactSet Data Source plugin for Lean</Description>
+
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<DebugType>full</DebugType>
+		<OutputPath>bin\Debug\</OutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<DebugType>pdbonly</DebugType>
+		<OutputPath>bin\Release\</OutputPath>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="..\..\Lean\Common\Properties\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="FactSet.SDK.FactSetOptions" Version="1.0.8" />
+		<PackageReference Include="FactSet.SDK.Utils" Version="1.0.0" />
+		<PackageReference Include="QuantConnect.Lean.Engine" Version="2.5.*" />
+		<PackageReference Include="protobuf-net" Version="3.1.33" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+	</ItemGroup>
+</Project>