Merge pull request opentripplanner#6996 from opentripplanner/serverinfo-validity-dates

svedbod · web-flow · commit 7fb9fc6345c0 · 2025-10-30T16:26:04.000+01:00
Added transit service validity dates and CPU cores to GraphQL ServerInfo and transitInfo
diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java
@@ -66,6 +66,7 @@
 import org.opentripplanner.apis.transmodel.model.framework.ServerInfoType;
 import org.opentripplanner.apis.transmodel.model.framework.StreetModeDurationInputType;
 import org.opentripplanner.apis.transmodel.model.framework.SystemNoticeType;
+import org.opentripplanner.apis.transmodel.model.framework.TransitInfoType;
 import org.opentripplanner.apis.transmodel.model.framework.TransmodelDirectives;
 import org.opentripplanner.apis.transmodel.model.framework.TransmodelScalars;
 import org.opentripplanner.apis.transmodel.model.framework.ValidityPeriodType;
@@ -219,6 +220,7 @@ private GraphQLSchema createDefault() {
     GraphQLOutputType systemNoticeType = SystemNoticeType.create();
     GraphQLOutputType linkGeometryType = PointsOnLinkType.create();
     GraphQLOutputType serverInfoType = ServerInfoType.create();
+    GraphQLOutputType transitInfoType = TransitInfoType.create(validityPeriodType);
     GraphQLOutputType authorityType = authorityTypeFactory.create(
       LineType.REF,
       PtSituationElementType.REF
@@ -1533,6 +1535,14 @@ private GraphQLSchema createDefault() {
           .dataFetcher(e -> projectInfo())
           .build()
       )
+      .field(
+        GraphQLFieldDefinition.newFieldDefinition()
+          .name("transitInfo")
+          .description("Get information about the transit data available in the system.")
+          .type(new GraphQLNonNull(transitInfoType))
+          .dataFetcher(e -> new Object())
+          .build()
+      )
       .field(datedServiceJourneyQueryFactory.createGetById(datedServiceJourneyType))
       .field(datedServiceJourneyQueryFactory.createQuery(datedServiceJourneyType))
       .build();
diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ServerInfoType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ServerInfoType.java
@@ -111,6 +111,14 @@ public static GraphQLOutputType create() {
           .dataFetcher(e -> GqlUtil.getTransitService(e).getTimeZone())
           .build()
       )
+      .field(
+        GraphQLFieldDefinition.newFieldDefinition()
+          .name("numberOfCores")
+          .description("Number of CPU cores on the OTP server")
+          .type(Scalars.GraphQLInt)
+          .dataFetcher(e -> Runtime.getRuntime().availableProcessors())
+          .build()
+      )
       .build();
   }
 }
diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransitInfoType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransitInfoType.java
@@ -0,0 +1,34 @@
+package org.opentripplanner.apis.transmodel.model.framework;
+
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLOutputType;
+import org.opentripplanner.apis.transmodel.model.siri.sx.ValidityPeriod;
+import org.opentripplanner.apis.transmodel.support.GqlUtil;
+
+public class TransitInfoType {
+
+  public static GraphQLOutputType create(GraphQLObjectType validityPeriodType) {
+    return GraphQLObjectType.newObject()
+      .name("TransitInfo")
+      .description("Information about the transit data available in the system.")
+      .field(
+        GraphQLFieldDefinition.newFieldDefinition()
+          .name("validityPeriod")
+          .description("The validity period for the transit data currently loaded in the system.")
+          .type(validityPeriodType)
+          .dataFetcher(environment -> {
+            var transitService = GqlUtil.getTransitService(environment);
+            var startTime = transitService.getTransitServiceStarts();
+            var endTime = transitService.getTransitServiceEnds();
+
+            Long startMillis = startTime != null ? startTime.toInstant().toEpochMilli() : null;
+            Long endMillis = endTime != null ? endTime.toInstant().toEpochMilli() : null;
+
+            return new ValidityPeriod(startMillis, endMillis);
+          })
+          .build()
+      )
+      .build();
+  }
+}
diff --git a/application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -814,6 +814,8 @@ type QueryType {
     "MultiModalMode for query. To control whether multi modal parent stop places, their mono modal children or both are included in the response. Does not affect mono modal stop places that do not belong to a multi modal stop place."
     multiModalMode: MultiModalMode = parent
   ): [StopPlace]! @timingData
+  "Get information about the transit data available in the system."
+  transitInfo: TransitInfo!
   "Input type for executing a travel search for a trip between two locations. Returns trip patterns describing suggested alternatives for the trip."
   trip(
     "Time and cost penalty on access/egress modes."
@@ -1184,6 +1186,8 @@ type ServerInfo {
     Note: The input data can be in several time zones, but OTP internally operates on a single one.
   """
   internalTransitModelTimeZone: String
+  "Number of CPU cores on the OTP server"
+  numberOfCores: Int
   "The 'configVersion' of the otp-config.json file."
   otpConfigVersion: String
   "The otp-serialization-version-id used to check graphs for compatibility with current version of OTP."
@@ -1382,6 +1386,12 @@ type TimetabledPassingTime {
   timingPoint: Boolean!
 }
 
+"Information about the transit data available in the system."
+type TransitInfo {
+  "The validity period for the transit data currently loaded in the system."
+  validityPeriod: ValidityPeriod
+}
+
 "Used to specify board and alight slack for a given modes."
 type TransportModeSlackType {
   modes: [TransportMode!]!

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,14 @@ public static GraphQLOutputType create() {`
`111`	`111`	`.dataFetcher(e -> GqlUtil.getTransitService(e).getTimeZone())`
`112`	`112`	`.build()`
`113`	`113`	`)`
	`114`	`+ .field(`
	`115`	`+ GraphQLFieldDefinition.newFieldDefinition()`
	`116`	`+ .name("numberOfCores")`
	`117`	`+ .description("Number of CPU cores on the OTP server")`
	`118`	`+ .type(Scalars.GraphQLInt)`
	`119`	`+ .dataFetcher(e -> Runtime.getRuntime().availableProcessors())`
	`120`	`+ .build()`
	`121`	`+ )`
`114`	`122`	`.build();`
`115`	`123`	`}`
`116`	`124`	`}`